From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935110AbcKMUgv (ORCPT ); Sun, 13 Nov 2016 15:36:51 -0500 Received: from mx2.suse.de ([195.135.220.15]:51137 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932549AbcKMUgs (ORCPT ); Sun, 13 Nov 2016 15:36:48 -0500 Date: Sun, 13 Nov 2016 21:36:46 +0100 Message-ID: From: Takashi Iwai To: Fabian Frederick Cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH V2 linux-next] ALSA: pci: don't opencode IS_REACHABLE() In-Reply-To: <1478989601-22858-1-git-send-email-fabf@skynet.be> References: <1478989601-22858-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 On Sat, 12 Nov 2016 23:26:41 +0100, Fabian Frederick wrote: > > Signed-off-by: Fabian Frederick > --- > V2: Convert everything in PCI branch in one patch (suggested by Takashi Iwai) Applied, thanks. Takashi > > sound/pci/als4000.c | 2 +- > sound/pci/au88x0/au88x0_game.c | 2 +- > sound/pci/azt3328.c | 2 +- > sound/pci/cmipci.c | 2 +- > sound/pci/cs4281.c | 2 +- > sound/pci/cs46xx/cs46xx_lib.c | 2 +- > sound/pci/emu10k1/emu10k1.c | 2 +- > sound/pci/ens1370.c | 2 +- > sound/pci/es1938.c | 2 +- > sound/pci/es1968.c | 2 +- > sound/pci/riptide/riptide.c | 2 +- > sound/pci/sonicvibes.c | 2 +- > sound/pci/trident/trident_main.c | 2 +- > sound/pci/via82xx.c | 2 +- > sound/pci/ymfpci/ymfpci.h | 2 +- > 15 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c > index edabe13..92bc06d 100644 > --- a/sound/pci/als4000.c > +++ b/sound/pci/als4000.c > @@ -84,7 +84,7 @@ MODULE_DESCRIPTION("Avance Logic ALS4000"); > MODULE_LICENSE("GPL"); > MODULE_SUPPORTED_DEVICE("{{Avance Logic,ALS4000}}"); > > -#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) > +#if IS_REACHABLE(CONFIG_GAMEPORT) > #define SUPPORT_JOYSTICK 1 > #endif > > diff --git a/sound/pci/au88x0/au88x0_game.c b/sound/pci/au88x0/au88x0_game.c > index 151815b..53abcd3 100644 > --- a/sound/pci/au88x0/au88x0_game.c > +++ b/sound/pci/au88x0/au88x0_game.c > @@ -36,7 +36,7 @@ > #include > #include > > -#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) > +#if IS_REACHABLE(CONFIG_GAMEPORT) > > #define VORTEX_GAME_DWAIT 20 /* 20 ms */ > > diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c > index 80c4a44..79b2e6b 100644 > --- a/sound/pci/azt3328.c > +++ b/sound/pci/azt3328.c > @@ -212,7 +212,7 @@ MODULE_DESCRIPTION("Aztech AZF3328 (PCI168)"); > MODULE_LICENSE("GPL"); > MODULE_SUPPORTED_DEVICE("{{Aztech,AZF3328}}"); > > -#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) > +#if IS_REACHABLE(CONFIG_GAMEPORT) > #define SUPPORT_GAMEPORT 1 > #endif > > diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c > index 73f5935..aeedc27 100644 > --- a/sound/pci/cmipci.c > +++ b/sound/pci/cmipci.c > @@ -48,7 +48,7 @@ MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8738}," > "{C-Media,CMI8338A}," > "{C-Media,CMI8338B}}"); > > -#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) > +#if IS_REACHABLE(CONFIG_GAMEPORT) > #define SUPPORT_JOYSTICK 1 > #endif > > diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c > index 615d8a9..8f0f5f2 100644 > --- a/sound/pci/cs4281.c > +++ b/sound/pci/cs4281.c > @@ -1194,7 +1194,7 @@ static void snd_cs4281_proc_init(struct cs4281 *chip) > * joystick support > */ > > -#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) > +#if IS_REACHABLE(CONFIG_GAMEPORT) > > static void snd_cs4281_gameport_trigger(struct gameport *gameport) > { > diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c > index 528102c..fde3cd4 100644 > --- a/sound/pci/cs46xx/cs46xx_lib.c > +++ b/sound/pci/cs46xx/cs46xx_lib.c > @@ -2718,7 +2718,7 @@ int snd_cs46xx_midi(struct snd_cs46xx *chip, int device) > * gameport interface > */ > > -#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) > +#if IS_REACHABLE(CONFIG_GAMEPORT) > > static void snd_cs46xx_gameport_trigger(struct gameport *gameport) > { > diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c > index db7a2e5..4733b68c 100644 > --- a/sound/pci/emu10k1/emu10k1.c > +++ b/sound/pci/emu10k1/emu10k1.c > @@ -37,7 +37,7 @@ MODULE_LICENSE("GPL"); > MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB Live!/PCI512/E-mu APS}," > "{Creative Labs,SB Audigy}}"); > > -#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE)) > +#if IS_REACHABLE(CONFIG_SND_SEQUENCER) > #define ENABLE_SYNTH > #include > #endif > diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c > index 7e760fe..51736c2 100644 > --- a/sound/pci/ens1370.c > +++ b/sound/pci/ens1370.c > @@ -79,7 +79,7 @@ MODULE_SUPPORTED_DEVICE("{{Ensoniq,AudioPCI ES1371/73}," > "{Ectiva,EV1938}}"); > #endif > > -#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) > +#if IS_REACHABLE(CONFIG_GAMEPORT) > #define SUPPORT_JOYSTICK > #endif > > diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c > index 6813558..e8d9430 100644 > --- a/sound/pci/es1938.c > +++ b/sound/pci/es1938.c > @@ -72,7 +72,7 @@ MODULE_SUPPORTED_DEVICE("{{ESS,ES1938}," > "{ESS,ES1969}," > "{TerraTec,128i PCI}}"); > > -#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) > +#if IS_REACHABLE(CONFIG_GAMEPORT) > #define SUPPORT_JOYSTICK 1 > #endif > > diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c > index 8146fb7..2ec2b1c 100644 > --- a/sound/pci/es1968.c > +++ b/sound/pci/es1968.c > @@ -126,7 +126,7 @@ MODULE_SUPPORTED_DEVICE("{{ESS,Maestro 2e}," > "{ESS,Maestro 1}," > "{TerraTec,DMX}}"); > > -#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) > +#if IS_REACHABLE(CONFIG_GAMEPORT) > #define SUPPORT_JOYSTICK 1 > #endif > > diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c > index ada5f01..19c9df6 100644 > --- a/sound/pci/riptide/riptide.c > +++ b/sound/pci/riptide/riptide.c > @@ -110,7 +110,7 @@ > #include > #include > > -#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) > +#if IS_REACHABLE(CONFIG_GAMEPORT) > #define SUPPORT_JOYSTICK 1 > #endif > > diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c > index e1a1387..a6aa48c 100644 > --- a/sound/pci/sonicvibes.c > +++ b/sound/pci/sonicvibes.c > @@ -45,7 +45,7 @@ MODULE_DESCRIPTION("S3 SonicVibes PCI"); > MODULE_LICENSE("GPL"); > MODULE_SUPPORTED_DEVICE("{{S3,SonicVibes PCI}}"); > > -#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) > +#if IS_REACHABLE(CONFIG_GAMEPORT) > #define SUPPORT_JOYSTICK 1 > #endif > > diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c > index 27f0ed8..92ad2d7 100644 > --- a/sound/pci/trident/trident_main.c > +++ b/sound/pci/trident/trident_main.c > @@ -3120,7 +3120,7 @@ static int snd_trident_mixer(struct snd_trident *trident, int pcm_spdif_device) > * gameport interface > */ > > -#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) > +#if IS_REACHABLE(CONFIG_GAMEPORT) > > static unsigned char snd_trident_gameport_read(struct gameport *gameport) > { > diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c > index 38a17b4..2d8c14e 100644 > --- a/sound/pci/via82xx.c > +++ b/sound/pci/via82xx.c > @@ -72,7 +72,7 @@ MODULE_DESCRIPTION("VIA VT82xx audio"); > MODULE_LICENSE("GPL"); > MODULE_SUPPORTED_DEVICE("{{VIA,VT82C686A/B/C,pci},{VIA,VT8233A/C,8235}}"); > > -#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) > +#if IS_REACHABLE(CONFIG_GAMEPORT) > #define SUPPORT_JOYSTICK 1 > #endif > > diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h > index 149d4cb..aa9bb06 100644 > --- a/sound/pci/ymfpci/ymfpci.h > +++ b/sound/pci/ymfpci/ymfpci.h > @@ -176,7 +176,7 @@ > #define YMFPCI_LEGACY2_IMOD (1 << 15) /* legacy IRQ mode */ > /* SIEN:IMOD 0:0 = legacy irq, 0:1 = INTA, 1:0 = serialized IRQ */ > > -#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) > +#if IS_REACHABLE(CONFIG_GAMEPORT) > #define SUPPORT_JOYSTICK > #endif > > -- > 2.7.4 >