Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1520205 > unrolled thread
| Started by | Fabian Frederick <fabf@skynet.be> |
|---|---|
| First post | 2016-11-12 09:40 +0100 |
| Last post | 2016-11-12 10:20 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 1/1 linux-next] ALSA: oss: don't opencode IS_REACHABLE() Fabian Frederick <fabf@skynet.be> - 2016-11-12 09:40 +0100
Re: [PATCH 1/1 linux-next] ALSA: oss: don't opencode IS_REACHABLE() Takashi Iwai <tiwai@suse.de> - 2016-11-12 10:20 +0100
| From | Fabian Frederick <fabf@skynet.be> |
|---|---|
| Date | 2016-11-12 09:40 +0100 |
| Subject | [PATCH 1/1 linux-next] ALSA: oss: don't opencode IS_REACHABLE() |
| Message-ID | <sCC0W-82Y-11@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Takashi Iwai <tiwai@suse.de> |
|---|---|
| Date | 2016-11-12 10:20 +0100 |
| Message-ID | <sCCDE-8uX-3@gated-at.bofh.it> |
| In reply to | #1520205 |
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
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web