* [PATCH 1/1 linux-next] ALSA: oss: don't opencode IS_REACHABLE()
@ 2016-11-12 8:36 Fabian Frederick
2016-11-12 9:18 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Fabian Frederick @ 2016-11-12 8:36 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-kernel, fabf
Signed-off-by: Fabian Frederick <fabf@skynet.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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1 linux-next] ALSA: oss: don't opencode IS_REACHABLE()
2016-11-12 8:36 [PATCH 1/1 linux-next] ALSA: oss: don't opencode IS_REACHABLE() Fabian Frederick
@ 2016-11-12 9:18 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2016-11-12 9:18 UTC (permalink / raw)
To: Fabian Frederick; +Cc: linux-kernel
On Sat, 12 Nov 2016 09:36:01 +0100,
Fabian Frederick wrote:
>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>
Applied, thanks.
Takashi
> ---
> 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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-12 9:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-12 8:36 [PATCH 1/1 linux-next] ALSA: oss: don't opencode IS_REACHABLE() Fabian Frederick
2016-11-12 9:18 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.