ALSA: oss: don't opencode IS_REACHABLE()
authorFabian Frederick <fabf@skynet.be>
Sat, 12 Nov 2016 08:36:01 +0000 (09:36 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sat, 12 Nov 2016 09:12:00 +0000 (10:12 +0100)
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/oss/pcm_oss.c

index ebc9fdfe64df618088a8d55efff8b5312af3385d..698a014195152ab6784c7840379e5478e586cf85 100644 (file)
@@ -2501,7 +2501,7 @@ static long snd_pcm_oss_ioctl(struct file *file, unsigned int cmd, unsigned long
                return put_user(SNDRV_OSS_VERSION, p);
        if (cmd == OSS_ALSAEMULVER)
                return put_user(1, p);
-#if defined(CONFIG_SND_MIXER_OSS) || (defined(MODULE) && defined(CONFIG_SND_MIXER_OSS_MODULE))
+#if IS_REACHABLE(CONFIG_SND_MIXER_OSS)
        if (((cmd >> 8) & 0xff) == 'M') {       /* mixer ioctl - for OSS compatibility */
                struct snd_pcm_substream *substream;
                int idx;