Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus

diff --combined include/sound/core.h
index 35424a971b7a68d89ab75630eac1e197ebae8619,7e558947268134a81ff5ad597d6baf29f4b88e6f,e5eec5f7350213c8fda3d6f76c3f0a725c22b1e0..1508c4ec1ba929162fa14651426d27dc9ab81437
--- 1/include/sound/core.h
--- 2/include/sound/core.h
--- 3/include/sound/core.h
+++ b/include/sound/core.h
@@@@ -43,6 -43,9 -43,9 +43,6 @@@@
   #ifdef CONFIG_PCI
   struct pci_dev;
   #endif
 --#ifdef CONFIG_SBUS
 --struct sbus_dev;
 --#endif
   
   /* device allocation stuff */
   
@@@@ -385,9 -388,13 -388,9 +385,13 @@@@ void snd_verbose_printd(const char *fil
   
   #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 */