summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai2008-11-07 09:06:05 +0100
committerTakashi Iwai2008-11-07 09:06:05 +0100
commit63cf123bf5d538a066e4a899390c9ce56ab6df9f (patch)
tree00a5e6eabcfdd310247018188f8ebe35b8b6f1ba /include/sound
parentALSA: ice1724 - Re-fix IRQ mask initialization (diff)
parentalsa: fix snd_BUG_on() and friends (diff)
downloadkernel-qcow2-linux-63cf123bf5d538a066e4a899390c9ce56ab6df9f.tar.gz
kernel-qcow2-linux-63cf123bf5d538a066e4a899390c9ce56ab6df9f.tar.xz
kernel-qcow2-linux-63cf123bf5d538a066e4a899390c9ce56ab6df9f.zip
Merge branch 'topic/fix/misc' into topic/misc
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/core.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/sound/core.h b/include/sound/core.h
index e5eec5f73502..7e5589472681 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -388,9 +388,13 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
#else /* !CONFIG_SND_DEBUG */
-#define snd_printd(fmt, args...) /* nothing */
-#define snd_BUG() /* nothing */
-#define snd_BUG_ON(cond) ({/*(void)(cond);*/ 0;}) /* always false */
+#define snd_printd(fmt, args...) do { } while (0)
+#define snd_BUG() do { } while (0)
+static inline int __snd_bug_on(void)
+{
+ return 0;
+}
+#define snd_BUG_ON(cond) __snd_bug_on() /* always false */
#endif /* CONFIG_SND_DEBUG */