diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-10 09:13:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-10 09:13:37 -0800 |
| commit | 3ad4f597058301c97f362e500a32f63f5c950a45 (patch) | |
| tree | db292345240916f4160d5bb8300473d21f786e82 /include | |
| parent | libata: revert convert-to-block-tagging patches (diff) | |
| parent | Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus (diff) | |
| download | linux-dev-3ad4f597058301c97f362e500a32f63f5c950a45.tar.xz linux-dev-3ad4f597058301c97f362e500a32f63f5c950a45.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Make the HP EliteBook 8530p use AD1884A model laptop
ALSA: gusextreme: Fix build errors
ALSA: hdsp: check for iobox and upload firmware during ioctl
ALSA: HDSP: check for io box before uploading firmware
ALSA: hda - Add another HP model (6730s) for AD1884A
alsa: fix snd_BUG_on() and friends
ALSA: hda - Add a quirk for MEDION MD96630
ALSA: hda - Limit the number of GPIOs show in proc
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/core.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index 35424a971b7a..1508c4ec1ba9 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -385,9 +385,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 */ |