Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938802AbcKLJSi (ORCPT ); Sat, 12 Nov 2016 04:18:38 -0500 Received: from mx2.suse.de ([195.135.220.15]:40450 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938730AbcKLJSg (ORCPT ); Sat, 12 Nov 2016 04:18:36 -0500 Date: Sat, 12 Nov 2016 10:18:35 +0100 Message-ID: From: Takashi Iwai To: Fabian Frederick Cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/1 linux-next] ALSA: oss: don't opencode IS_REACHABLE() In-Reply-To: <1478939761-1819-1-git-send-email-fabf@skynet.be> References: <1478939761-1819-1-git-send-email-fabf@skynet.be> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.5 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 904 Lines: 31 On Sat, 12 Nov 2016 09:36:01 +0100, Fabian Frederick wrote: > > Signed-off-by: Fabian Frederick 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 >