From: Takashi Iwai Date: Tue, 28 Jun 2011 06:59:30 +0000 (+0200) Subject: ALSA: hda - Fix warnings with CONFIG_SND_POWER_SAVE=n X-Git-Tag: MMI-PSA29.97-13-9~18103^2~124^2~62 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ff2b7e2a3fdb341a235e0b2eccc3c8914d26c1fb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 --- diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index c71cd7fb6d11..79ef65e3ae14 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