| Message ID | 20230314121216.413434-37-schnelle@linux.ibm.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | None | expand |
On 3/14/23 05:12, Niklas Schnelle wrote: > 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: Niklas Schnelle <schnelle@linux.ibm.com> Acked-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/Kconfig | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index f0872970daf9..e5d6f886e25d 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -453,6 +453,7 @@ config 21285_WATCHDOG > config 977_WATCHDOG > tristate "NetWinder WB83C977 watchdog" > depends on (FOOTBRIDGE && ARCH_NETWINDER) || (ARM && COMPILE_TEST) > + depends on HAS_IOPORT > help > Say Y here to include support for the WB977 watchdog included in > NetWinder machines. Alternatively say M to compile the driver as > @@ -1271,6 +1272,7 @@ config ITCO_WDT > select WATCHDOG_CORE > depends on I2C || I2C=n > depends on MFD_INTEL_PMC_BXT || !MFD_INTEL_PMC_BXT > + depends on HAS_IOPORT # for I2C_I801 > select LPC_ICH if !EXPERT > select I2C_I801 if !EXPERT && I2C > help > @@ -2148,7 +2150,7 @@ comment "PCI-based Watchdog Cards" > > config PCIPCWATCHDOG > tristate "Berkshire Products PCI-PC Watchdog" > - depends on PCI > + depends on PCI && HAS_IOPORT > help > This is the driver for the Berkshire Products PCI-PC Watchdog card. > This card simply watches your kernel to make sure it doesn't freeze, > @@ -2163,7 +2165,7 @@ config PCIPCWATCHDOG > > config WDTPCI > tristate "PCI-WDT500/501 Watchdog timer" > - depends on PCI > + depends on PCI && HAS_IOPORT > help > If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N. >
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index f0872970daf9..e5d6f886e25d 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -453,6 +453,7 @@ config 21285_WATCHDOG config 977_WATCHDOG tristate "NetWinder WB83C977 watchdog" depends on (FOOTBRIDGE && ARCH_NETWINDER) || (ARM && COMPILE_TEST) + depends on HAS_IOPORT help Say Y here to include support for the WB977 watchdog included in NetWinder machines. Alternatively say M to compile the driver as @@ -1271,6 +1272,7 @@ config ITCO_WDT select WATCHDOG_CORE depends on I2C || I2C=n depends on MFD_INTEL_PMC_BXT || !MFD_INTEL_PMC_BXT + depends on HAS_IOPORT # for I2C_I801 select LPC_ICH if !EXPERT select I2C_I801 if !EXPERT && I2C help @@ -2148,7 +2150,7 @@ comment "PCI-based Watchdog Cards" config PCIPCWATCHDOG tristate "Berkshire Products PCI-PC Watchdog" - depends on PCI + depends on PCI && HAS_IOPORT help This is the driver for the Berkshire Products PCI-PC Watchdog card. This card simply watches your kernel to make sure it doesn't freeze, @@ -2163,7 +2165,7 @@ config PCIPCWATCHDOG config WDTPCI tristate "PCI-WDT500/501 Watchdog timer" - depends on PCI + depends on PCI && HAS_IOPORT help If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.
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: Niklas Schnelle <schnelle@linux.ibm.com> --- drivers/watchdog/Kconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)