diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2014-02-10 09:48:47 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-10 11:42:00 +0100 |
| commit | 8eeaa2f9e06dcfb45593a0fcd91e81abc7f5d209 (patch) | |
| tree | 9edb1030921070d747288d4cea33dc8500dd1a5c /sound/core/control.c | |
| parent | ALSA: Fix typos in alsa-driver-api.xml (diff) | |
| download | linux-dev-8eeaa2f9e06dcfb45593a0fcd91e81abc7f5d209.tar.xz linux-dev-8eeaa2f9e06dcfb45593a0fcd91e81abc7f5d209.zip | |
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/control.c')
| -rw-r--r-- | sound/core/control.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index d8aa206e8bde..c228f00e5701 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -151,7 +151,7 @@ void snd_ctl_notify(struct snd_card *card, unsigned int mask, if (snd_BUG_ON(!card || !id)) return; read_lock(&card->ctl_files_rwlock); -#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE) +#if IS_ENABLED(CONFIG_SND_MIXER_OSS) card->mixer_oss_change_count++; #endif list_for_each_entry(ctl, &card->ctl_files, list) { |