summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-05-18 15:35:54 +0200
committerTakashi Iwai <tiwai@suse.de>2017-05-18 16:38:49 +0200
commit9aee03f39c13fc674f5973baa69d13e32b45b535 (patch)
tree521677455f73b0996ce8c4890f00d1afe7a0c241 /sound
parentb46fe5d9607c2a14618c746a02892ead0f0f4637 (diff)
downloadlinux-stable-9aee03f39c13fc674f5973baa69d13e32b45b535.tar.gz
linux-stable-9aee03f39c13fc674f5973baa69d13e32b45b535.tar.bz2
linux-stable-9aee03f39c13fc674f5973baa69d13e32b45b535.zip
ALSA: pcm: use "do {} while (0)" for empty macro
Recent compilers produce a harmless warning for the new pcm_call_notify() macro when CONFIG_SND_PCM_OSS is disabled: sound/core/pcm.c: In function 'snd_pcm_free': sound/core/pcm.c:905:37: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] This turns the empty macro into a 'do {} while (0)' statement to avoid the warning. Fixes: 58f30d650c7f ("ALSA: pcm: Build pcm notifier code conditionally") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 24acbfb5c531..d30dba0ee688 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -894,7 +894,7 @@ static void snd_pcm_free_stream(struct snd_pcm_str * pstr)
_notify->call(pcm); \
} while (0)
#else
-#define pcm_call_notify(pcm, call) /* NOP */
+#define pcm_call_notify(pcm, call) do {} while (0)
#endif
static int snd_pcm_free(struct snd_pcm *pcm)