Merge branch 'topic/fix/misc' into topic/misc

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 */