Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1520206 > unrolled thread
| Started by | Fabian Frederick <fabf@skynet.be> |
|---|---|
| First post | 2016-11-12 09:50 +0100 |
| Last post | 2016-11-12 10:30 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 1/1 linux-next] ALSA: pci: don't opencode IS_REACHABLE() Fabian Frederick <fabf@skynet.be> - 2016-11-12 09:50 +0100
Re: [PATCH 1/1 linux-next] ALSA: pci: don't opencode IS_REACHABLE() Takashi Iwai <tiwai@suse.de> - 2016-11-12 10:30 +0100
| From | Fabian Frederick <fabf@skynet.be> |
|---|---|
| Date | 2016-11-12 09:50 +0100 |
| Subject | [PATCH 1/1 linux-next] ALSA: pci: don't opencode IS_REACHABLE() |
| Message-ID | <sCCaB-86l-5@gated-at.bofh.it> |
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
sound/pci/au88x0/au88x0_game.c | 2 +-
sound/pci/azt3328.c | 2 +-
sound/pci/cs4281.c | 2 +-
sound/pci/cs46xx/cs46xx_lib.c | 2 +-
sound/pci/emu10k1/emu10k1.c | 2 +-
sound/pci/trident/trident_main.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
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 <linux/gameport.h>
#include <linux/export.h>
-#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/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 <sound/emu10k1_synth.h>
#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)
{
--
2.7.4
[toc] | [next] | [standalone]
| From | Takashi Iwai <tiwai@suse.de> |
|---|---|
| Date | 2016-11-12 10:30 +0100 |
| Message-ID | <sCCNk-6w-9@gated-at.bofh.it> |
| In reply to | #1520206 |
On Sat, 12 Nov 2016 09:40:53 +0100,
Fabian Frederick wrote:
>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>
This one is postponed. Please resubmit a patch covering all in
sound/pci/*, as I mentioned in the reply to your RFC patch.
thanks,
Takashi
> ---
> sound/pci/au88x0/au88x0_game.c | 2 +-
> sound/pci/azt3328.c | 2 +-
> sound/pci/cs4281.c | 2 +-
> sound/pci/cs46xx/cs46xx_lib.c | 2 +-
> sound/pci/emu10k1/emu10k1.c | 2 +-
> sound/pci/trident/trident_main.c | 2 +-
> 6 files changed, 6 insertions(+), 6 deletions(-)
>
> 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 <linux/gameport.h>
> #include <linux/export.h>
>
> -#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/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 <sound/emu10k1_synth.h>
> #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)
> {
> --
> 2.7.4
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web