Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938656AbcKLIgI (ORCPT ); Sat, 12 Nov 2016 03:36:08 -0500 Received: from mailrelay104.isp.belgacom.be ([195.238.20.131]:47945 "EHLO mailrelay104.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752476AbcKLIgH (ORCPT ); Sat, 12 Nov 2016 03:36:07 -0500 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2B4AgBF1CZY/1QC9FFdHQEFAQsBgzEBA?= =?us-ascii?q?QEBAR+BWI0+qVuCD4IHhiOCDUAUAQIBAQEBAQEBYiiFPiMpJkskE4hlsVCMBIY?= =?us-ascii?q?8iHKCfAuDCgWaPpBdApAeSZEDHjeBAoJpAYJLPTSFGYI8AQEB?= From: Fabian Frederick To: Takashi Iwai Cc: linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH 1/1 linux-next] ALSA: oss: don't opencode IS_REACHABLE() Date: Sat, 12 Nov 2016 09:36:01 +0100 Message-Id: <1478939761-1819-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 768 Lines: 20 Signed-off-by: Fabian Frederick --- 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