redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ALSA: hda - Fix possible compile warnings regarding CONFIG_PM

Browse source 
Replace with a proper ifdef check of CONFIG_PM_SLEEP in hda_intel.c.
But other places in HD-audio driver are still marked with CONFIG_PM,
since these can be called for power-saving even without
CONFIG_PM_SLEEP.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-08-14 18:10:09 +02:00
parent 6152597971
commit 7ccbde57ce
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sound/pci/hda/hda_intel.c
View file

@ -2409,11 +2409,10 @@ static void azx_power_notify(struct hda_bus *bus)
} }
#endif /* CONFIG_SND_HDA_POWER_SAVE */ #endif /* CONFIG_SND_HDA_POWER_SAVE */
#ifdef CONFIG_PM #if defined(CONFIG_PM_SLEEP) || defined(SUPPORT_VGA_SWITCHEROO)
/* /*
* power management * power management
*/ */
static int azx_suspend(struct device *dev) static int azx_suspend(struct device *dev)
{ {
struct pci_dev *pci = to_pci_dev(dev); struct pci_dev *pci = to_pci_dev(dev);
@ -2471,10 +2470,8 @@ static int azx_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(azx_pm, azx_suspend, azx_resume); static SIMPLE_DEV_PM_OPS(azx_pm, azx_suspend, azx_resume);
#define AZX_PM_OPS &azx_pm #define AZX_PM_OPS &azx_pm
#else #else
#define azx_suspend(dev)
#define azx_resume(dev)
#define AZX_PM_OPS NULL #define AZX_PM_OPS NULL
#endif /* CONFIG_PM */ #endif /* CONFIG_PM_SLEEP || SUPPORT_VGA_SWITCHEROO */
/* /*