diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-10 03:48:47 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-10 05:42:00 -0500 |
commit | 8eeaa2f9e06dcfb45593a0fcd91e81abc7f5d209 (patch) | |
tree | 9edb1030921070d747288d4cea33dc8500dd1a5c /sound/core/info.c | |
parent | 0a11458cbbb81d044c8fc5a77a7584cd33f08c48 (diff) |
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/info.c')
-rw-r--r-- | sound/core/info.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/info.c b/sound/core/info.c index e79baa11b60e..7916c07b9324 100644 --- a/sound/core/info.c +++ b/sound/core/info.c | |||
@@ -540,7 +540,7 @@ int __init snd_info_init(void) | |||
540 | snd_oss_root = entry; | 540 | snd_oss_root = entry; |
541 | } | 541 | } |
542 | #endif | 542 | #endif |
543 | #if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) | 543 | #if IS_ENABLED(CONFIG_SND_SEQUENCER) |
544 | { | 544 | { |
545 | struct snd_info_entry *entry; | 545 | struct snd_info_entry *entry; |
546 | if ((entry = snd_info_create_module_entry(THIS_MODULE, "seq", NULL)) == NULL) | 546 | if ((entry = snd_info_create_module_entry(THIS_MODULE, "seq", NULL)) == NULL) |
@@ -567,7 +567,7 @@ int __exit snd_info_done(void) | |||
567 | snd_minor_info_done(); | 567 | snd_minor_info_done(); |
568 | snd_info_version_done(); | 568 | snd_info_version_done(); |
569 | if (snd_proc_root) { | 569 | if (snd_proc_root) { |
570 | #if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) | 570 | #if IS_ENABLED(CONFIG_SND_SEQUENCER) |
571 | snd_info_free_entry(snd_seq_root); | 571 | snd_info_free_entry(snd_seq_root); |
572 | #endif | 572 | #endif |
573 | #ifdef CONFIG_SND_OSSEMUL | 573 | #ifdef CONFIG_SND_OSSEMUL |