aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-08-14 12:10:09 -0400
committerTakashi Iwai <tiwai@suse.de>2012-08-14 12:11:51 -0400
commit7ccbde57ce312ff1388c2990699f8863280808ac (patch)
tree477c035659ce549d928bd468c7c54747a82ea743 /sound/pci
parent6152597971db4055b7b03ccc60afcd62214d41f4 (diff)
ALSA: hda - Fix possible compile warnings regarding CONFIG_PM
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>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/hda_intel.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 23ad7e216a6b..464ea16bdd9e 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2409,11 +2409,10 @@ static void azx_power_notify(struct hda_bus *bus)
2409} 2409}
2410#endif /* CONFIG_SND_HDA_POWER_SAVE */ 2410#endif /* CONFIG_SND_HDA_POWER_SAVE */
2411 2411
2412#ifdef CONFIG_PM 2412#if defined(CONFIG_PM_SLEEP) || defined(SUPPORT_VGA_SWITCHEROO)
2413/* 2413/*
2414 * power management 2414 * power management
2415 */ 2415 */
2416
2417static int azx_suspend(struct device *dev) 2416static int azx_suspend(struct device *dev)
2418{ 2417{
2419 struct pci_dev *pci = to_pci_dev(dev); 2418 struct pci_dev *pci = to_pci_dev(dev);
@@ -2471,10 +2470,8 @@ static int azx_resume(struct device *dev)
2471static SIMPLE_DEV_PM_OPS(azx_pm, azx_suspend, azx_resume); 2470static SIMPLE_DEV_PM_OPS(azx_pm, azx_suspend, azx_resume);
2472#define AZX_PM_OPS &azx_pm 2471#define AZX_PM_OPS &azx_pm
2473#else 2472#else
2474#define azx_suspend(dev)
2475#define azx_resume(dev)
2476#define AZX_PM_OPS NULL 2473#define AZX_PM_OPS NULL
2477#endif /* CONFIG_PM */ 2474#endif /* CONFIG_PM_SLEEP || SUPPORT_VGA_SWITCHEROO */
2478 2475
2479 2476
2480/* 2477/*