Skip to content

Commit 7997604

Browse files
niklas88mchehab
authored andcommitted
media: add HAS_IOPORT dependencies
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them. Link: https://lore.kernel.org/linux-media/[email protected] Reviewed-by: Sean Young <[email protected]> # media/rc Co-developed-by: Arnd Bergmann <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Niklas Schnelle <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent 582d4ad commit 7997604

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

drivers/media/pci/dm1105/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
config DVB_DM1105
33
tristate "SDMC DM1105 based PCI cards"
4-
depends on DVB_CORE && PCI && I2C && I2C_ALGOBIT
4+
depends on DVB_CORE && PCI && I2C && I2C_ALGOBIT && HAS_IOPORT
55
select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
66
select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
77
select DVB_STV0288 if MEDIA_SUBDRV_AUTOSELECT

drivers/media/radio/Kconfig

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if RADIO_ADAPTERS
1515

1616
config RADIO_MAXIRADIO
1717
tristate "Guillemot MAXI Radio FM 2000 radio"
18-
depends on PCI
18+
depends on PCI && HAS_IOPORT
1919
select RADIO_TEA575X
2020
help
2121
Choose Y here if you have this radio card. This card may also be
@@ -232,6 +232,7 @@ source "drivers/media/radio/wl128x/Kconfig"
232232
menuconfig V4L_RADIO_ISA_DRIVERS
233233
bool "ISA radio devices"
234234
depends on ISA || COMPILE_TEST
235+
depends on HAS_IOPORT
235236
help
236237
Say Y here to enable support for these ISA drivers.
237238

@@ -240,6 +241,7 @@ if V4L_RADIO_ISA_DRIVERS
240241
config RADIO_AZTECH
241242
tristate "Aztech/Packard Bell Radio"
242243
depends on ISA || COMPILE_TEST
244+
depends on HAS_IOPORT
243245
select RADIO_ISA
244246
help
245247
Choose Y here if you have one of these FM radio cards, and then fill
@@ -260,6 +262,7 @@ config RADIO_AZTECH_PORT
260262
config RADIO_CADET
261263
tristate "ADS Cadet AM/FM Tuner"
262264
depends on ISA || COMPILE_TEST
265+
depends on HAS_IOPORT
263266
help
264267
Choose Y here if you have one of these AM/FM radio cards, and then
265268
fill in the port address below.
@@ -270,6 +273,7 @@ config RADIO_CADET
270273
config RADIO_GEMTEK
271274
tristate "GemTek Radio card (or compatible) support"
272275
depends on ISA || COMPILE_TEST
276+
depends on HAS_IOPORT
273277
select RADIO_ISA
274278
help
275279
Choose Y here if you have this FM radio card, and then fill in the
@@ -309,6 +313,7 @@ config RADIO_GEMTEK_PROBE
309313

310314
config RADIO_ISA
311315
depends on ISA || COMPILE_TEST
316+
depends on HAS_IOPORT
312317
tristate
313318

314319
config RADIO_MIROPCM20
@@ -329,6 +334,7 @@ config RADIO_MIROPCM20
329334
config RADIO_RTRACK
330335
tristate "AIMSlab RadioTrack (aka RadioReveal) support"
331336
depends on ISA || COMPILE_TEST
337+
depends on HAS_IOPORT
332338
select RADIO_ISA
333339
help
334340
Choose Y here if you have one of these FM radio cards, and then fill
@@ -383,6 +389,7 @@ config RADIO_RTRACK_PORT
383389
config RADIO_SF16FMI
384390
tristate "SF16-FMI/SF16-FMP/SF16-FMD Radio"
385391
depends on ISA || COMPILE_TEST
392+
depends on HAS_IOPORT
386393
help
387394
Choose Y here if you have one of these FM radio cards.
388395

@@ -392,6 +399,7 @@ config RADIO_SF16FMI
392399
config RADIO_SF16FMR2
393400
tristate "SF16-FMR2/SF16-FMD2 Radio"
394401
depends on ISA || COMPILE_TEST
402+
depends on HAS_IOPORT
395403
select RADIO_TEA575X
396404
help
397405
Choose Y here if you have one of these FM radio cards.
@@ -402,6 +410,7 @@ config RADIO_SF16FMR2
402410
config RADIO_TERRATEC
403411
tristate "TerraTec ActiveRadio ISA Standalone"
404412
depends on ISA || COMPILE_TEST
413+
depends on HAS_IOPORT
405414
select RADIO_ISA
406415
help
407416
Choose Y here if you have this FM radio card.
@@ -416,6 +425,7 @@ config RADIO_TERRATEC
416425
config RADIO_TRUST
417426
tristate "Trust FM radio card"
418427
depends on ISA || COMPILE_TEST
428+
depends on HAS_IOPORT
419429
select RADIO_ISA
420430
help
421431
This is a driver for the Trust FM radio cards. Say Y if you have
@@ -439,6 +449,7 @@ config RADIO_TRUST_PORT
439449
config RADIO_TYPHOON
440450
tristate "Typhoon Radio (a.k.a. EcoRadio)"
441451
depends on ISA || COMPILE_TEST
452+
depends on HAS_IOPORT
442453
select RADIO_ISA
443454
help
444455
Choose Y here if you have one of these FM radio cards, and then fill
@@ -473,6 +484,7 @@ config RADIO_TYPHOON_PORT
473484
config RADIO_ZOLTRIX
474485
tristate "Zoltrix Radio"
475486
depends on ISA || COMPILE_TEST
487+
depends on HAS_IOPORT
476488
select RADIO_ISA
477489
help
478490
Choose Y here if you have one of these FM radio cards, and then fill

drivers/media/rc/Kconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ if RC_DEVICES
148148
config IR_ENE
149149
tristate "ENE eHome Receiver/Transceiver (pnp id: ENE0100/ENE02xxx)"
150150
depends on PNP || COMPILE_TEST
151+
depends on HAS_IOPORT
151152
help
152153
Say Y here to enable support for integrated infrared receiver
153154
/transceiver made by ENE.
@@ -161,6 +162,7 @@ config IR_ENE
161162
config IR_FINTEK
162163
tristate "Fintek Consumer Infrared Transceiver"
163164
depends on PNP || COMPILE_TEST
165+
depends on HAS_IOPORT
164166
help
165167
Say Y here to enable support for integrated infrared receiver
166168
/transceiver made by Fintek. This chip is found on assorted
@@ -249,6 +251,7 @@ config IR_IMON_RAW
249251
config IR_ITE_CIR
250252
tristate "ITE Tech Inc. IT8712/IT8512 Consumer Infrared Transceiver"
251253
depends on PNP || COMPILE_TEST
254+
depends on HAS_IOPORT
252255
help
253256
Say Y here to enable support for integrated infrared receivers
254257
/transceivers made by ITE Tech Inc. These are found in
@@ -301,6 +304,7 @@ config IR_MTK
301304
config IR_NUVOTON
302305
tristate "Nuvoton w836x7hg Consumer Infrared Transceiver"
303306
depends on PNP || COMPILE_TEST
307+
depends on HAS_IOPORT
304308
help
305309
Say Y here to enable support for integrated infrared receiver
306310
/transceiver made by Nuvoton (formerly Winbond). This chip is
@@ -345,6 +349,7 @@ config IR_RX51
345349

346350
config IR_SERIAL
347351
tristate "Homebrew Serial Port Receiver"
352+
depends on HAS_IOPORT
348353
help
349354
Say Y if you want to use Homebrew Serial Port Receivers and
350355
Transceivers.
@@ -412,6 +417,7 @@ config IR_TTUSBIR
412417
config IR_WINBOND_CIR
413418
tristate "Winbond IR remote control"
414419
depends on (X86 && PNP) || COMPILE_TEST
420+
depends on HAS_IOPORT
415421
select NEW_LEDS
416422
select LEDS_CLASS
417423
select BITREVERSE

0 commit comments

Comments
 (0)