diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-02-10 12:48:47 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-10 14:42:00 +0400 |
| commit | 8eeaa2f9e06dcfb45593a0fcd91e81abc7f5d209 (patch) | |
| tree | 9edb1030921070d747288d4cea33dc8500dd1a5c /sound/core/timer.c | |
| parent | 0a11458cbbb81d044c8fc5a77a7584cd33f08c48 (diff) | |
| download | linux-8eeaa2f9e06dcfb45593a0fcd91e81abc7f5d209.tar.xz | |
ALSA: Replace with IS_ENABLED()
Replace the lengthy #if defined(XXX) || defined(XXX_MODULE) with the
new IS_ENABLED() macro.
The patch still doesn't cover all ifdefs. For example, the dependency
on CONFIG_GAMEPORT is still open-coded because this also has an extra
dependency on MODULE. Similarly, an open-coded ifdef in pcm_oss.c and
some sequencer-related stuff are left untouched.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 6ddcf06f52f9..cbec51464c5b 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -35,9 +35,9 @@ #include <sound/initval.h> #include <linux/kmod.h> -#if defined(CONFIG_SND_HRTIMER) || defined(CONFIG_SND_HRTIMER_MODULE) +#if IS_ENABLED(CONFIG_SND_HRTIMER) #define DEFAULT_TIMER_LIMIT 4 -#elif defined(CONFIG_SND_RTCTIMER) || defined(CONFIG_SND_RTCTIMER_MODULE) +#elif IS_ENABLED(CONFIG_SND_RTCTIMER) #define DEFAULT_TIMER_LIMIT 2 #else #define DEFAULT_TIMER_LIMIT 1 |