diff options
author | Fabian Frederick <fabf@skynet.be> | 2016-11-12 17:26:41 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-11-13 15:33:41 -0500 |
commit | b2fac0730347d591b528d8f0e4a9438c1bb6f558 (patch) | |
tree | 17c99d770da97612c8fdd6d60bab3fb20556c1ca | |
parent | 658355b599c700c9826f581d087cbd9c26c2cb56 (diff) |
ALSA: pci: don't opencode IS_REACHABLE()
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/als4000.c | 2 | ||||
-rw-r--r-- | sound/pci/au88x0/au88x0_game.c | 2 | ||||
-rw-r--r-- | sound/pci/azt3328.c | 2 | ||||
-rw-r--r-- | sound/pci/cmipci.c | 2 | ||||
-rw-r--r-- | sound/pci/cs4281.c | 2 | ||||
-rw-r--r-- | sound/pci/cs46xx/cs46xx_lib.c | 2 | ||||
-rw-r--r-- | sound/pci/emu10k1/emu10k1.c | 2 | ||||
-rw-r--r-- | sound/pci/ens1370.c | 2 | ||||
-rw-r--r-- | sound/pci/es1938.c | 2 | ||||
-rw-r--r-- | sound/pci/es1968.c | 2 | ||||
-rw-r--r-- | sound/pci/riptide/riptide.c | 2 | ||||
-rw-r--r-- | sound/pci/sonicvibes.c | 2 | ||||
-rw-r--r-- | sound/pci/trident/trident_main.c | 2 | ||||
-rw-r--r-- | sound/pci/via82xx.c | 2 | ||||
-rw-r--r-- | 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 edabe1371660..92bc06d01288 100644 --- a/sound/pci/als4000.c +++ b/sound/pci/als4000.c | |||
@@ -84,7 +84,7 @@ MODULE_DESCRIPTION("Avance Logic ALS4000"); | |||
84 | MODULE_LICENSE("GPL"); | 84 | MODULE_LICENSE("GPL"); |
85 | MODULE_SUPPORTED_DEVICE("{{Avance Logic,ALS4000}}"); | 85 | MODULE_SUPPORTED_DEVICE("{{Avance Logic,ALS4000}}"); |
86 | 86 | ||
87 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | 87 | #if IS_REACHABLE(CONFIG_GAMEPORT) |
88 | #define SUPPORT_JOYSTICK 1 | 88 | #define SUPPORT_JOYSTICK 1 |
89 | #endif | 89 | #endif |
90 | 90 | ||
diff --git a/sound/pci/au88x0/au88x0_game.c b/sound/pci/au88x0/au88x0_game.c index 151815b857a0..53abcd3eccbd 100644 --- a/sound/pci/au88x0/au88x0_game.c +++ b/sound/pci/au88x0/au88x0_game.c | |||
@@ -36,7 +36,7 @@ | |||
36 | #include <linux/gameport.h> | 36 | #include <linux/gameport.h> |
37 | #include <linux/export.h> | 37 | #include <linux/export.h> |
38 | 38 | ||
39 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | 39 | #if IS_REACHABLE(CONFIG_GAMEPORT) |
40 | 40 | ||
41 | #define VORTEX_GAME_DWAIT 20 /* 20 ms */ | 41 | #define VORTEX_GAME_DWAIT 20 /* 20 ms */ |
42 | 42 | ||
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c index 80c4a4456197..79b2e6b7d88b 100644 --- a/sound/pci/azt3328.c +++ b/sound/pci/azt3328.c | |||
@@ -212,7 +212,7 @@ MODULE_DESCRIPTION("Aztech AZF3328 (PCI168)"); | |||
212 | MODULE_LICENSE("GPL"); | 212 | MODULE_LICENSE("GPL"); |
213 | MODULE_SUPPORTED_DEVICE("{{Aztech,AZF3328}}"); | 213 | MODULE_SUPPORTED_DEVICE("{{Aztech,AZF3328}}"); |
214 | 214 | ||
215 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | 215 | #if IS_REACHABLE(CONFIG_GAMEPORT) |
216 | #define SUPPORT_GAMEPORT 1 | 216 | #define SUPPORT_GAMEPORT 1 |
217 | #endif | 217 | #endif |
218 | 218 | ||
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index 73f593526b2d..aeedc270ed9b 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c | |||
@@ -48,7 +48,7 @@ MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8738}," | |||
48 | "{C-Media,CMI8338A}," | 48 | "{C-Media,CMI8338A}," |
49 | "{C-Media,CMI8338B}}"); | 49 | "{C-Media,CMI8338B}}"); |
50 | 50 | ||
51 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | 51 | #if IS_REACHABLE(CONFIG_GAMEPORT) |
52 | #define SUPPORT_JOYSTICK 1 | 52 | #define SUPPORT_JOYSTICK 1 |
53 | #endif | 53 | #endif |
54 | 54 | ||
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index 615d8a99d8c8..8f0f5f24e40e 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c | |||
@@ -1194,7 +1194,7 @@ static void snd_cs4281_proc_init(struct cs4281 *chip) | |||
1194 | * joystick support | 1194 | * joystick support |
1195 | */ | 1195 | */ |
1196 | 1196 | ||
1197 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | 1197 | #if IS_REACHABLE(CONFIG_GAMEPORT) |
1198 | 1198 | ||
1199 | static void snd_cs4281_gameport_trigger(struct gameport *gameport) | 1199 | static void snd_cs4281_gameport_trigger(struct gameport *gameport) |
1200 | { | 1200 | { |
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index 528102cc2d5d..fde3cd48258c 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) | |||
2718 | * gameport interface | 2718 | * gameport interface |
2719 | */ | 2719 | */ |
2720 | 2720 | ||
2721 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | 2721 | #if IS_REACHABLE(CONFIG_GAMEPORT) |
2722 | 2722 | ||
2723 | static void snd_cs46xx_gameport_trigger(struct gameport *gameport) | 2723 | static void snd_cs46xx_gameport_trigger(struct gameport *gameport) |
2724 | { | 2724 | { |
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c index db7a2e5e4a14..4733b68c9eb0 100644 --- a/sound/pci/emu10k1/emu10k1.c +++ b/sound/pci/emu10k1/emu10k1.c | |||
@@ -37,7 +37,7 @@ MODULE_LICENSE("GPL"); | |||
37 | MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB Live!/PCI512/E-mu APS}," | 37 | MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB Live!/PCI512/E-mu APS}," |
38 | "{Creative Labs,SB Audigy}}"); | 38 | "{Creative Labs,SB Audigy}}"); |
39 | 39 | ||
40 | #if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE)) | 40 | #if IS_REACHABLE(CONFIG_SND_SEQUENCER) |
41 | #define ENABLE_SYNTH | 41 | #define ENABLE_SYNTH |
42 | #include <sound/emu10k1_synth.h> | 42 | #include <sound/emu10k1_synth.h> |
43 | #endif | 43 | #endif |
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index 7e760fed0728..51736c2b5a00 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c | |||
@@ -79,7 +79,7 @@ MODULE_SUPPORTED_DEVICE("{{Ensoniq,AudioPCI ES1371/73}," | |||
79 | "{Ectiva,EV1938}}"); | 79 | "{Ectiva,EV1938}}"); |
80 | #endif | 80 | #endif |
81 | 81 | ||
82 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | 82 | #if IS_REACHABLE(CONFIG_GAMEPORT) |
83 | #define SUPPORT_JOYSTICK | 83 | #define SUPPORT_JOYSTICK |
84 | #endif | 84 | #endif |
85 | 85 | ||
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index 681355829484..e8d943071a8c 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c | |||
@@ -72,7 +72,7 @@ MODULE_SUPPORTED_DEVICE("{{ESS,ES1938}," | |||
72 | "{ESS,ES1969}," | 72 | "{ESS,ES1969}," |
73 | "{TerraTec,128i PCI}}"); | 73 | "{TerraTec,128i PCI}}"); |
74 | 74 | ||
75 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | 75 | #if IS_REACHABLE(CONFIG_GAMEPORT) |
76 | #define SUPPORT_JOYSTICK 1 | 76 | #define SUPPORT_JOYSTICK 1 |
77 | #endif | 77 | #endif |
78 | 78 | ||
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 8146fb76a4ad..2ec2b1ce0af6 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -126,7 +126,7 @@ MODULE_SUPPORTED_DEVICE("{{ESS,Maestro 2e}," | |||
126 | "{ESS,Maestro 1}," | 126 | "{ESS,Maestro 1}," |
127 | "{TerraTec,DMX}}"); | 127 | "{TerraTec,DMX}}"); |
128 | 128 | ||
129 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | 129 | #if IS_REACHABLE(CONFIG_GAMEPORT) |
130 | #define SUPPORT_JOYSTICK 1 | 130 | #define SUPPORT_JOYSTICK 1 |
131 | #endif | 131 | #endif |
132 | 132 | ||
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index ada5f01d479c..19c9df6b0f3d 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c | |||
@@ -110,7 +110,7 @@ | |||
110 | #include <sound/opl3.h> | 110 | #include <sound/opl3.h> |
111 | #include <sound/initval.h> | 111 | #include <sound/initval.h> |
112 | 112 | ||
113 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | 113 | #if IS_REACHABLE(CONFIG_GAMEPORT) |
114 | #define SUPPORT_JOYSTICK 1 | 114 | #define SUPPORT_JOYSTICK 1 |
115 | #endif | 115 | #endif |
116 | 116 | ||
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c index e1a13870bb80..a6aa48c5b969 100644 --- a/sound/pci/sonicvibes.c +++ b/sound/pci/sonicvibes.c | |||
@@ -45,7 +45,7 @@ MODULE_DESCRIPTION("S3 SonicVibes PCI"); | |||
45 | MODULE_LICENSE("GPL"); | 45 | MODULE_LICENSE("GPL"); |
46 | MODULE_SUPPORTED_DEVICE("{{S3,SonicVibes PCI}}"); | 46 | MODULE_SUPPORTED_DEVICE("{{S3,SonicVibes PCI}}"); |
47 | 47 | ||
48 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | 48 | #if IS_REACHABLE(CONFIG_GAMEPORT) |
49 | #define SUPPORT_JOYSTICK 1 | 49 | #define SUPPORT_JOYSTICK 1 |
50 | #endif | 50 | #endif |
51 | 51 | ||
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index 27f0ed840979..92ad2d7a6bf8 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) | |||
3120 | * gameport interface | 3120 | * gameport interface |
3121 | */ | 3121 | */ |
3122 | 3122 | ||
3123 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | 3123 | #if IS_REACHABLE(CONFIG_GAMEPORT) |
3124 | 3124 | ||
3125 | static unsigned char snd_trident_gameport_read(struct gameport *gameport) | 3125 | static unsigned char snd_trident_gameport_read(struct gameport *gameport) |
3126 | { | 3126 | { |
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 38a17b4342a6..2d8c14e3f8d2 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c | |||
@@ -72,7 +72,7 @@ MODULE_DESCRIPTION("VIA VT82xx audio"); | |||
72 | MODULE_LICENSE("GPL"); | 72 | MODULE_LICENSE("GPL"); |
73 | MODULE_SUPPORTED_DEVICE("{{VIA,VT82C686A/B/C,pci},{VIA,VT8233A/C,8235}}"); | 73 | MODULE_SUPPORTED_DEVICE("{{VIA,VT82C686A/B/C,pci},{VIA,VT8233A/C,8235}}"); |
74 | 74 | ||
75 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | 75 | #if IS_REACHABLE(CONFIG_GAMEPORT) |
76 | #define SUPPORT_JOYSTICK 1 | 76 | #define SUPPORT_JOYSTICK 1 |
77 | #endif | 77 | #endif |
78 | 78 | ||
diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h index 149d4cb46998..aa9bb065f385 100644 --- a/sound/pci/ymfpci/ymfpci.h +++ b/sound/pci/ymfpci/ymfpci.h | |||
@@ -176,7 +176,7 @@ | |||
176 | #define YMFPCI_LEGACY2_IMOD (1 << 15) /* legacy IRQ mode */ | 176 | #define YMFPCI_LEGACY2_IMOD (1 << 15) /* legacy IRQ mode */ |
177 | /* SIEN:IMOD 0:0 = legacy irq, 0:1 = INTA, 1:0 = serialized IRQ */ | 177 | /* SIEN:IMOD 0:0 = legacy irq, 0:1 = INTA, 1:0 = serialized IRQ */ |
178 | 178 | ||
179 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | 179 | #if IS_REACHABLE(CONFIG_GAMEPORT) |
180 | #define SUPPORT_JOYSTICK | 180 | #define SUPPORT_JOYSTICK |
181 | #endif | 181 | #endif |
182 | 182 | ||