diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-11 11:47:17 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-11 11:48:33 +0100 |
| commit | 5c0b9bec460c348d2ee5a800c288e5d0e8fcda66 (patch) | |
| tree | 8feaee6399fd52f1b4bae94551878e45c476a75d /sound | |
| parent | 11d518e07d700eeb5bcec36bfd5f501e405230dd (diff) | |
| download | kernel_samsung_crespo-5c0b9bec460c348d2ee5a800c288e5d0e8fcda66.zip kernel_samsung_crespo-5c0b9bec460c348d2ee5a800c288e5d0e8fcda66.tar.gz kernel_samsung_crespo-5c0b9bec460c348d2ee5a800c288e5d0e8fcda66.tar.bz2 | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 8aee322..f2337e4 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); |