summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-06-28 08:59:30 +0200
committerTakashi Iwai <tiwai@suse.de>2011-06-28 08:59:30 +0200
commitff2b7e2a3fdb341a235e0b2eccc3c8914d26c1fb (patch)
tree6adb59c3318d6861cb7b0271b6a3cfc033b3450f
parent880a050f4ac4399c9da4aea3ca19a701f9a727e0 (diff)
downloadop-kernel-dev-ff2b7e2a3fdb341a235e0b2eccc3c8914d26c1fb.zip
op-kernel-dev-ff2b7e2a3fdb341a235e0b2eccc3c8914d26c1fb.tar.gz
ALSA: hda - Fix warnings with CONFIG_SND_POWER_SAVE=n
Use static inline for dummy function to fix the warnings like below sound/pci/hda/patch_sigmatel.c: In function ‘stac92xx_init’: sound/pci/hda/patch_sigmatel.c:4387:3: warning: statement with no effect sound/pci/hda/patch_sigmatel.c: In function ‘stac92xx_resume’: sound/pci/hda/patch_sigmatel.c:4927:3: warning: statement with no effect Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/hda_codec.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index c71cd7f..79ef65e 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -1011,17 +1011,15 @@ int snd_hda_suspend(struct hda_bus *bus);
int snd_hda_resume(struct hda_bus *bus);
#endif
-#ifdef CONFIG_SND_HDA_POWER_SAVE
static inline
int hda_call_check_power_status(struct hda_codec *codec, hda_nid_t nid)
{
+#ifdef CONFIG_SND_HDA_POWER_SAVE
if (codec->patch_ops.check_power_status)
return codec->patch_ops.check_power_status(codec, nid);
+#endif
return 0;
}
-#else
-#define hda_call_check_power_status(codec, nid) 0
-#endif
/*
* get widget information
OpenPOWER on IntegriCloud