[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1478939761-1819-1-git-send-email-fabf@skynet.be>
Date: Sat, 12 Nov 2016 09:36:01 +0100
From: Fabian Frederick <fabf@...net.be>
To: Takashi Iwai <tiwai@...e.de>
Cc: linux-kernel@...r.kernel.org, fabf@...net.be
Subject: [PATCH 1/1 linux-next] ALSA: oss: don't opencode IS_REACHABLE()
Signed-off-by: Fabian Frederick <fabf@...net.be>
---
sound/core/oss/pcm_oss.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index ebc9fdf..698a014 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -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;
--
2.7.4
Powered by blists - more mailing lists