| Message ID | 20200111214736.3002-2-pierre-louis.bossart@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ALSA: fix compiler warnings | expand |
On Sat, 11 Jan 2020 22:47:35 +0100, Pierre-Louis Bossart wrote: > > GCC reports the following warning with W=1 > > sound/pci/hda/patch_realtek.c: In function ‘alc269_suspend’: > sound/pci/hda/patch_realtek.c:3616:29: warning: suggest braces around > empty body in an ‘if’ statement [-Wempty-body] > 3616 | alc5505_dsp_suspend(codec); > | ^ > > sound/pci/hda/patch_realtek.c: In function ‘alc269_resume’: > sound/pci/hda/patch_realtek.c:3651:28: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body] > 3651 | alc5505_dsp_resume(codec); > | ^ > > This is a classic macro problem and can indeed lead to bad program > flows. > > Fix by using the usual "do { } while (0)" pattern > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Thanks, applied now. Takashi
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 73407b25a777..d7b9bedff33c 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3600,8 +3600,8 @@ static void alc5505_dsp_init(struct hda_codec *codec) } #ifdef HALT_REALTEK_ALC5505 -#define alc5505_dsp_suspend(codec) /* NOP */ -#define alc5505_dsp_resume(codec) /* NOP */ +#define alc5505_dsp_suspend(codec) do { } while (0) /* NOP */ +#define alc5505_dsp_resume(codec) do { } while (0) /* NOP */ #else #define alc5505_dsp_suspend(codec) alc5505_dsp_halt(codec) #define alc5505_dsp_resume(codec) alc5505_dsp_back_from_halt(codec)
GCC reports the following warning with W=1 sound/pci/hda/patch_realtek.c: In function ‘alc269_suspend’: sound/pci/hda/patch_realtek.c:3616:29: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body] 3616 | alc5505_dsp_suspend(codec); | ^ sound/pci/hda/patch_realtek.c: In function ‘alc269_resume’: sound/pci/hda/patch_realtek.c:3651:28: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body] 3651 | alc5505_dsp_resume(codec); | ^ This is a classic macro problem and can indeed lead to bad program flows. Fix by using the usual "do { } while (0)" pattern Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- sound/pci/hda/patch_realtek.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)