From: Niklas Schnelle <schnelle@linux.ibm.com>
To: Arnd Bergmann <arnd@arndb.de>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Mauro Carvalho Chehab" <mchehab@kernel.org>,
"Alan Stern" <stern@rowland.harvard.edu>,
"Rafael J. Wysocki" <rafael@kernel.org>,
"Geert Uytterhoeven" <geert@linux-m68k.org>,
"Paul Walmsley" <paul.walmsley@sifive.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Albert Ou" <aou@eecs.berkeley.edu>,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
linux-pci@vger.kernel.org, "Arnd Bergmann" <arnd@kernel.org>,
alsa-devel@alsa-project.org
Subject: [PATCH v5 32/44] sound: add HAS_IOPORT dependencies
Date: Mon, 22 May 2023 12:50:37 +0200 [thread overview]
Message-ID: <20230522105049.1467313-33-schnelle@linux.ibm.com> (raw)
In-Reply-To: <20230522105049.1467313-1-schnelle@linux.ibm.com>
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.
Co-developed-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
---
sound/drivers/Kconfig | 3 +++
sound/isa/Kconfig | 1 +
sound/pci/Kconfig | 45 ++++++++++++++++++++++++++++++++-----------
sound/pcmcia/Kconfig | 1 +
4 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index be3009746f3a..864991d8776d 100644
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -128,6 +128,7 @@ config SND_VIRMIDI
config SND_MTPAV
tristate "MOTU MidiTimePiece AV multiport MIDI"
+ depends on HAS_IOPORT
select SND_RAWMIDI
help
To use a MOTU MidiTimePiece AV multiport MIDI adapter
@@ -152,6 +153,7 @@ config SND_MTS64
config SND_SERIAL_U16550
tristate "UART16550 serial MIDI driver"
+ depends on HAS_IOPORT
select SND_RAWMIDI
help
To include support for MIDI serial port interfaces, say Y here
@@ -185,6 +187,7 @@ config SND_SERIAL_GENERIC
config SND_MPU401
tristate "Generic MPU-401 UART driver"
+ depends on HAS_IOPORT
select SND_MPU401_UART
help
Say Y here to include support for MIDI ports compatible with
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 6ffa48dd5983..f8159179e38d 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -23,6 +23,7 @@ menuconfig SND_ISA
bool "ISA sound devices"
depends on ISA || COMPILE_TEST
depends on ISA_DMA_API
+ depends on HAS_IOPORT
default y
help
Support for sound devices connected via the ISA bus.
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 861958451ef5..787868c9e91b 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -26,7 +26,7 @@ config SND_ALS300
select SND_PCM
select SND_AC97_CODEC
select SND_OPL3_LIB
- depends on ZONE_DMA
+ depends on ZONE_DMA && HAS_IOPORT
help
Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+
@@ -36,6 +36,7 @@ config SND_ALS300
config SND_ALS4000
tristate "Avance Logic ALS4000"
depends on ISA_DMA_API
+ depends on HAS_IOPORT
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_PCM
@@ -51,7 +52,7 @@ config SND_ALI5451
tristate "ALi M5451 PCI Audio Controller"
select SND_MPU401_UART
select SND_AC97_CODEC
- depends on ZONE_DMA
+ depends on ZONE_DMA && HAS_IOPORT
help
Say Y here to include support for the integrated AC97 sound
device on motherboards using the ALi M5451 Audio Controller
@@ -96,6 +97,7 @@ config SND_ATIIXP_MODEM
config SND_AU8810
tristate "Aureal Advantage"
+ depends on HAS_IOPORT
select SND_MPU401_UART
select SND_AC97_CODEC
help
@@ -110,6 +112,7 @@ config SND_AU8810
config SND_AU8820
tristate "Aureal Vortex"
+ depends on HAS_IOPORT
select SND_MPU401_UART
select SND_AC97_CODEC
help
@@ -123,6 +126,7 @@ config SND_AU8820
config SND_AU8830
tristate "Aureal Vortex 2"
+ depends on HAS_IOPORT
select SND_MPU401_UART
select SND_AC97_CODEC
help
@@ -157,7 +161,7 @@ config SND_AZT3328
select SND_RAWMIDI
select SND_AC97_CODEC
select SND_TIMER
- depends on ZONE_DMA
+ depends on ZONE_DMA && HAS_IOPORT
help
Say Y here to include support for Aztech AZF3328 (PCI168)
soundcards.
@@ -193,6 +197,7 @@ config SND_BT87X_OVERCLOCK
config SND_CA0106
tristate "SB Audigy LS / Live 24bit"
+ depends on HAS_IOPORT
select SND_AC97_CODEC
select SND_RAWMIDI
select SND_VMASTER
@@ -205,6 +210,7 @@ config SND_CA0106
config SND_CMIPCI
tristate "C-Media 8338, 8738, 8768, 8770"
+ depends on HAS_IOPORT
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_PCM
@@ -221,6 +227,7 @@ config SND_OXYGEN_LIB
config SND_OXYGEN
tristate "C-Media 8786, 8787, 8788 (Oxygen)"
+ depends on HAS_IOPORT
select SND_OXYGEN_LIB
select SND_PCM
select SND_MPU401_UART
@@ -246,6 +253,7 @@ config SND_OXYGEN
config SND_CS4281
tristate "Cirrus Logic (Sound Fusion) CS4281"
+ depends on HAS_IOPORT
select SND_OPL3_LIB
select SND_RAWMIDI
select SND_AC97_CODEC
@@ -257,6 +265,7 @@ config SND_CS4281
config SND_CS46XX
tristate "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x"
+ depends on HAS_IOPORT
select SND_RAWMIDI
select SND_AC97_CODEC
select FW_LOADER
@@ -290,6 +299,7 @@ config SND_CS5530
config SND_CS5535AUDIO
tristate "CS5535/CS5536 Audio"
depends on X86_32 || MIPS || COMPILE_TEST
+ depends on HAS_IOPORT
select SND_PCM
select SND_AC97_CODEC
help
@@ -307,6 +317,7 @@ config SND_CS5535AUDIO
config SND_CTXFI
tristate "Creative Sound Blaster X-Fi"
+ depends on HAS_IOPORT
select SND_PCM
help
If you want to use soundcards based on Creative Sound Blastr X-Fi
@@ -468,7 +479,7 @@ config SND_EMU10K1
select SND_AC97_CODEC
select SND_TIMER
select SND_SEQ_DEVICE if SND_SEQUENCER != n
- depends on ZONE_DMA
+ depends on ZONE_DMA && HAS_IOPORT
help
Say Y to include support for Sound Blaster PCI 512, Live!,
Audigy and E-MU APS/0404/1010/1212/1616/1820 soundcards.
@@ -491,7 +502,7 @@ config SND_EMU10K1X
tristate "Emu10k1X (Dell OEM Version)"
select SND_AC97_CODEC
select SND_RAWMIDI
- depends on ZONE_DMA
+ depends on ZONE_DMA && HAS_IOPORT
help
Say Y here to include support for the Dell OEM version of the
Sound Blaster Live!.
@@ -501,6 +512,7 @@ config SND_EMU10K1X
config SND_ENS1370
tristate "(Creative) Ensoniq AudioPCI 1370"
+ depends on HAS_IOPORT
select SND_RAWMIDI
select SND_PCM
help
@@ -511,6 +523,7 @@ config SND_ENS1370
config SND_ENS1371
tristate "(Creative) Ensoniq AudioPCI 1371/1373"
+ depends on HAS_IOPORT
select SND_RAWMIDI
select SND_AC97_CODEC
help
@@ -525,7 +538,7 @@ config SND_ES1938
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_AC97_CODEC
- depends on ZONE_DMA
+ depends on ZONE_DMA && HAS_IOPORT
help
Say Y here to include support for soundcards based on ESS Solo-1
(ES1938, ES1946, ES1969) chips.
@@ -537,7 +550,7 @@ config SND_ES1968
tristate "ESS ES1968/1978 (Maestro-1/2/2E)"
select SND_MPU401_UART
select SND_AC97_CODEC
- depends on ZONE_DMA
+ depends on ZONE_DMA && HAS_IOPORT
help
Say Y here to include support for soundcards based on ESS Maestro
1/2/2E chips.
@@ -569,6 +582,7 @@ config SND_ES1968_RADIO
config SND_FM801
tristate "ForteMedia FM801"
+ depends on HAS_IOPORT
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_AC97_CODEC
@@ -624,7 +638,7 @@ config SND_ICE1712
select SND_MPU401_UART
select SND_AC97_CODEC
select BITREVERSE
- depends on ZONE_DMA
+ depends on ZONE_DMA && HAS_IOPORT
help
Say Y here to include support for soundcards based on the
ICE1712 (Envy24) chip.
@@ -640,6 +654,7 @@ config SND_ICE1712
config SND_ICE1724
tristate "ICE/VT1724/1720 (Envy24HT/PT)"
+ depends on HAS_IOPORT
select SND_RAWMIDI
select SND_AC97_CODEC
select SND_VMASTER
@@ -712,7 +727,7 @@ config SND_LX6464ES
config SND_MAESTRO3
tristate "ESS Allegro/Maestro3"
select SND_AC97_CODEC
- depends on ZONE_DMA
+ depends on ZONE_DMA && HAS_IOPORT
help
Say Y here to include support for soundcards based on ESS Maestro 3
(Allegro) chips.
@@ -753,6 +768,7 @@ config SND_NM256
config SND_PCXHR
tristate "Digigram PCXHR"
+ depends on HAS_IOPORT
select FW_LOADER
select SND_PCM
select SND_HWDEP
@@ -764,6 +780,7 @@ config SND_PCXHR
config SND_RIPTIDE
tristate "Conexant Riptide"
+ depends on HAS_IOPORT
select FW_LOADER
select SND_OPL3_LIB
select SND_MPU401_UART
@@ -808,6 +825,7 @@ config SND_RME9652
config SND_SE6X
tristate "Studio Evolution SE6X"
depends on SND_OXYGEN=n && SND_VIRTUOSO=n # PCI ID conflict
+ depends on HAS_IOPORT
select SND_OXYGEN_LIB
select SND_PCM
select SND_MPU401_UART
@@ -830,7 +848,7 @@ config SND_SONICVIBES
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_AC97_CODEC
- depends on ZONE_DMA
+ depends on ZONE_DMA && HAS_IOPORT
help
Say Y here to include support for soundcards based on the S3
SonicVibes chip.
@@ -842,7 +860,7 @@ config SND_TRIDENT
tristate "Trident 4D-Wave DX/NX; SiS 7018"
select SND_MPU401_UART
select SND_AC97_CODEC
- depends on ZONE_DMA
+ depends on ZONE_DMA && HAS_IOPORT
help
Say Y here to include support for soundcards based on Trident
4D-Wave DX/NX or SiS 7018 chips.
@@ -852,6 +870,7 @@ config SND_TRIDENT
config SND_VIA82XX
tristate "VIA 82C686A/B, 8233/8235 AC97 Controller"
+ depends on HAS_IOPORT
select SND_MPU401_UART
select SND_AC97_CODEC
help
@@ -863,6 +882,7 @@ config SND_VIA82XX
config SND_VIA82XX_MODEM
tristate "VIA 82C686A/B, 8233 based Modems"
+ depends on HAS_IOPORT
select SND_AC97_CODEC
help
Say Y here to include support for the integrated MC97 modem on
@@ -873,6 +893,7 @@ config SND_VIA82XX_MODEM
config SND_VIRTUOSO
tristate "Asus Virtuoso 66/100/200 (Xonar)"
+ depends on HAS_IOPORT
select SND_OXYGEN_LIB
select SND_PCM
select SND_MPU401_UART
@@ -889,6 +910,7 @@ config SND_VIRTUOSO
config SND_VX222
tristate "Digigram VX222"
+ depends on HAS_IOPORT
select SND_VX_LIB
help
Say Y here to include support for Digigram VX222 soundcards.
@@ -898,6 +920,7 @@ config SND_VX222
config SND_YMFPCI
tristate "Yamaha YMF724/740/744/754"
+ depends on HAS_IOPORT
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_AC97_CODEC
diff --git a/sound/pcmcia/Kconfig b/sound/pcmcia/Kconfig
index 10291c43cb18..2e3dfc1ff540 100644
--- a/sound/pcmcia/Kconfig
+++ b/sound/pcmcia/Kconfig
@@ -4,6 +4,7 @@
menuconfig SND_PCMCIA
bool "PCMCIA sound devices"
depends on PCMCIA
+ depends on HAS_IOPORT
default y
help
Support for sound devices connected via the PCMCIA bus.
--
2.39.2
next prev parent reply other threads:[~2023-05-22 10:55 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-22 10:50 [PATCH v5 00/44] treewide: Remove I/O port accessors for HAS_IOPORT=n Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 01/44] kgdb: add HAS_IOPORT dependency Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 02/44] ata: add HAS_IOPORT dependencies Niklas Schnelle
2023-05-22 11:49 ` Damien Le Moal
2023-05-22 10:50 ` [PATCH v5 03/44] char: " Niklas Schnelle
2023-07-04 8:09 ` Geert Uytterhoeven
2023-05-22 10:50 ` [PATCH v5 04/44] char: ipmi: handle " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 05/44] char: tpm: " Niklas Schnelle
2023-05-24 1:09 ` Jarkko Sakkinen
2023-05-24 3:13 ` Jarkko Sakkinen
2023-05-22 10:50 ` [PATCH v5 06/44] comedi: add " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 07/44] counter: add HAS_IOPORT_MAP dependency Niklas Schnelle
2023-06-08 14:59 ` William Breathitt Gray
2023-06-09 14:57 ` Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 08/44] /dev/port: don't compile file operations without CONFIG_DEVPORT Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 09/44] drm: handle HAS_IOPORT dependencies Niklas Schnelle
2023-05-22 12:38 ` Thomas Zimmermann
2023-05-22 13:06 ` Arnd Bergmann
2023-05-22 13:14 ` Gerd Hoffmann
2023-05-22 10:50 ` [PATCH v5 10/44] firmware: dmi-sysfs: handle HAS_IOPORT=n Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 11/44] gpio: add HAS_IOPORT dependencies Niklas Schnelle
2023-05-23 8:15 ` Bartosz Golaszewski
2023-05-22 10:50 ` [PATCH v5 12/44] hwmon: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 13/44] i2c: " Niklas Schnelle
2023-09-24 21:01 ` Wolfram Sang
2023-10-23 15:36 ` Wolfram Sang
2023-05-22 10:50 ` [PATCH v5 14/44] iio: ad7606: Kconfig: " Niklas Schnelle
2023-05-28 18:55 ` Jonathan Cameron
2023-05-30 9:21 ` Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 15/44] Input: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 16/44] Input: gameport: add ISA and " Niklas Schnelle
2023-05-22 22:16 ` Dmitry Torokhov
2023-05-22 10:50 ` [PATCH v5 17/44] leds: add " Niklas Schnelle
2023-05-25 11:21 ` Lee Jones
2023-05-22 10:50 ` [PATCH v5 18/44] media: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 19/44] misc: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 20/44] mISDN: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 21/44] mpt fusion: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 22/44] net: handle " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 23/44] parport: PC style parport depends on HAS_IOPORT Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 24/44] PCI: Make quirk using inw() depend " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 25/44] PCI/sysfs: Make I/O resource " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 26/44] pcmcia: add HAS_IOPORT dependencies Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 27/44] platform: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 28/44] pnp: " Niklas Schnelle
2023-05-22 11:54 ` Jaroslav Kysela
2023-05-22 10:50 ` [PATCH v5 29/44] power: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 30/44] rtc: " Niklas Schnelle
2023-05-22 13:09 ` Maciej W. Rozycki
2023-06-06 21:35 ` (subset) " Alexandre Belloni
2023-07-04 8:06 ` Geert Uytterhoeven
2023-07-04 11:25 ` Arnd Bergmann
2023-07-04 12:46 ` Geert Uytterhoeven
2023-05-22 10:50 ` [PATCH v5 31/44] scsi: " Niklas Schnelle
2023-05-22 22:28 ` Martin K. Petersen
2023-05-23 7:26 ` Niklas Schnelle
2023-06-01 0:00 ` Martin K. Petersen
2023-05-22 10:50 ` Niklas Schnelle [this message]
2023-05-22 11:55 ` [PATCH v5 32/44] sound: " Jaroslav Kysela
2023-05-22 11:59 ` Takashi Iwai
2023-05-22 13:54 ` Niklas Schnelle
2023-05-22 14:44 ` Takashi Iwai
2023-05-22 10:50 ` [PATCH v5 33/44] speakup: add HAS_IOPORT dependency for SPEAKUP_SERIALIO Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 34/44] staging: add HAS_IOPORT dependencies Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 35/44] tty: serial: handle " Niklas Schnelle
2023-05-30 14:39 ` Greg Kroah-Hartman
2023-05-22 10:50 ` [PATCH v5 36/44] usb: add " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 37/44] usb: uhci: handle " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 38/44] usb: pci-quirks: " Niklas Schnelle
2023-05-29 14:34 ` Greg Kroah-Hartman
2023-05-22 10:50 ` [PATCH v5 39/44] vgacon: add " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 40/44] fbdev: " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 41/44] video: Handle " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 42/44] watchdog: add " Niklas Schnelle
2023-05-22 10:50 ` [PATCH v5 43/44] wireless: " Niklas Schnelle
2023-05-24 7:38 ` Kalle Valo
2023-05-25 12:01 ` Niklas Schnelle
2023-05-25 16:08 ` [v5,43/44] wifi: " Kalle Valo
2023-05-22 10:50 ` [PATCH v5 44/44] asm-generic/io.h: Remove I/O port accessors for HAS_IOPORT=n Niklas Schnelle
2023-05-22 11:29 ` [PATCH v5 00/44] treewide: " Arnd Bergmann
2023-06-27 9:12 ` Niklas Schnelle
2023-06-27 12:53 ` Arnd Bergmann
2023-06-29 13:26 ` Niklas Schnelle
2023-06-08 1:42 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230522105049.1467313-33-schnelle@linux.ibm.com \
--to=schnelle@linux.ibm.com \
--cc=alsa-devel@alsa-project.org \
--cc=aou@eecs.berkeley.edu \
--cc=arnd@arndb.de \
--cc=arnd@kernel.org \
--cc=bhelgaas@google.com \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=perex@perex.cz \
--cc=rafael@kernel.org \
--cc=stern@rowland.harvard.edu \
--cc=tiwai@suse.com \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).