summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2018-04-11 08:35:18 +1000
committerDave Airlie <airlied@redhat.com>2018-04-11 08:35:18 +1000
commitc975f17d700445051ad0f87c6822bd15816c587f (patch)
tree7fd7679451aba8bdc9d999e7dca43342f5252f0d /sound
parent694f54f680f7fd8e9561928fbfc537d9afbc3d79 (diff)
parent8cd1b5bd70cccda6854088825e725a513ec919c6 (diff)
downloadlinux-c975f17d700445051ad0f87c6822bd15816c587f.tar.gz
linux-c975f17d700445051ad0f87c6822bd15816c587f.tar.xz
Merge tag 'drm-misc-next-fixes-2018-04-04' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
hda_intel: Don't declare azx PM ops if VGA_SWITCHEROO configured (Lukas) Cc: Lukas Wunner <lukas@wunner.de> Cc: Takashi Iwai <tiwai@suse.de> * tag 'drm-misc-next-fixes-2018-04-04' of git://anongit.freedesktop.org/drm/drm-misc: ALSA: hda - Silence PM ops build warning
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_intel.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index e2f649fffd56..2fffea094538 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -987,7 +987,7 @@ static int param_set_xint(const char *val, const struct kernel_param *kp)
#define azx_del_card_list(chip) /* NOP */
#endif /* CONFIG_PM */
-#if defined(CONFIG_PM_SLEEP) || defined(SUPPORT_VGA_SWITCHEROO)
+#ifdef CONFIG_PM_SLEEP
/*
* power management
*/
@@ -1068,9 +1068,7 @@ static int azx_resume(struct device *dev)
trace_azx_resume(chip);
return 0;
}
-#endif /* CONFIG_PM_SLEEP || SUPPORT_VGA_SWITCHEROO */
-#ifdef CONFIG_PM_SLEEP
/* put codec down to D3 at hibernation for Intel SKL+;
* otherwise BIOS may still access the codec and screw up the driver
*/