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/pcm_native.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/pcm_native.c')
-rw-r--r-- | sound/core/pcm_native.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 10b5d1a9dec0..e3664116736b 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
@@ -399,7 +399,7 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream, | |||
399 | return -EBADFD; | 399 | return -EBADFD; |
400 | } | 400 | } |
401 | snd_pcm_stream_unlock_irq(substream); | 401 | snd_pcm_stream_unlock_irq(substream); |
402 | #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE) | 402 | #if IS_ENABLED(CONFIG_SND_PCM_OSS) |
403 | if (!substream->oss.oss) | 403 | if (!substream->oss.oss) |
404 | #endif | 404 | #endif |
405 | if (atomic_read(&substream->mmap_count)) | 405 | if (atomic_read(&substream->mmap_count)) |