From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 11 Dec 2008 10:47:17 +0000 (+0100)
Subject: ALSA: hda - Fix a compile warning when CONFIG_PM=n
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5c0b9bec460c348d2ee5a800c288e5d0e8fcda66;p=deliverable%2Flinux.git

ALSA: hda - Fix a compile warning when CONFIG_PM=n

Fixed the compile warning regarding the unused function when built
with CONFIG_PM=n:
  sound/pci/hda/hda_intel.c:1905: warning: ‘snd_hda_codecs_inuse’ defined but not used

snd_hda_codecs_inuse() is used only in the resume callback.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 8aee322313ed..f2337e4eddda 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1900,6 +1900,12 @@ static void azx_power_notify(struct hda_bus *bus)
 	else if (chip->running && power_save_controller)
 		azx_stop_chip(chip);
 }
+#endif /* CONFIG_SND_HDA_POWER_SAVE */
+
+#ifdef CONFIG_PM
+/*
+ * power management
+ */
 
 static int snd_hda_codecs_inuse(struct hda_bus *bus)
 {
@@ -1911,14 +1917,7 @@ static int snd_hda_codecs_inuse(struct hda_bus *bus)
 	}
 	return 0;
 }
-#else /* !CONFIG_SND_HDA_POWER_SAVE */
-#define snd_hda_codecs_inuse(bus) 1
-#endif /* CONFIG_SND_HDA_POWER_SAVE */
 
-#ifdef CONFIG_PM
-/*
- * power management
- */
 static int azx_suspend(struct pci_dev *pci, pm_message_t state)
 {
 	struct snd_card *card = pci_get_drvdata(pci);