| Message ID | 20190617111937.2355936-1-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | scsi: fdomain: fix building pcmcia front-end | expand |
On Wednesday 19 June 2019 05:13:01 Martin K. Petersen wrote: > > Arnd, > > > Move the common support outside of the SCSI_LOWLEVEL section. > > Alternatively, we could move all of SCSI_LOWLEVEL_PCMCIA into > > SCSI_LOWLEVEL. This would be more sensible, but might cause surprises > > for users that have SCSI_LOWLEVEL disabled. > > It seems messy to me that PCMCIA lives outside of the LOWLEVEL section. > > Given that the number of users that rely on PCMCIA for their system disk > is probably pretty low, I think I'm leaning towards cleaning things up > instead of introducing a nonsensical top level option. > > Or even better: Get rid of SCSI_FDOMAIN as a user-visible option and > select it if either of the PCI/ISA/PCMCIA drivers are enabled. SCSI_FDOMAIN is not an user-visible option. PCI/ISA/PCMCIA drivers select it: Symbol: PCMCIA_FDOMAIN [=m] Type : tristate Prompt: Future Domain PCMCIA support Location: -> Device Drivers -> SCSI device support -> PCMCIA SCSI adapter support (SCSI_LOWLEVEL_PCMCIA [=y]) Defined at drivers/scsi/pcmcia/Kconfig:22 Depends on: SCSI_LOWLEVEL_PCMCIA [=y] && SCSI [=y] && PCMCIA [=m] && m && MODULES [=y] Selects: SCSI_FDOMAIN [=m] Symbol: SCSI_FDOMAIN [=m] Type : tristate Defined at drivers/scsi/Kconfig:666 Depends on: SCSI_LOWLEVEL [=y] && SCSI [=y] Selected by [m]: - SCSI_FDOMAIN_PCI [=m] && SCSI_LOWLEVEL [=y] && PCI [=y] && SCSI [=y] - SCSI_FDOMAIN_ISA [=m] && SCSI_LOWLEVEL [=y] && ISA [=y] && SCSI [=y] - PCMCIA_FDOMAIN [=m] && SCSI_LOWLEVEL_PCMCIA [=y] && SCSI [=y] && PCMCIA [=m] && m && MODULES [=y] Symbol: SCSI_FDOMAIN_ISA [=m] Type : tristate Prompt: Future Domain 16xx ISA SCSI support Location: -> Device Drivers -> SCSI device support -> SCSI low-level drivers (SCSI_LOWLEVEL [=y]) Defined at drivers/scsi/Kconfig:687 Depends on: SCSI_LOWLEVEL [=y] && ISA [=y] && SCSI [=y] Selects: CHECK_SIGNATURE [=y] && SCSI_FDOMAIN [=m] Symbol: SCSI_FDOMAIN_PCI [=m] Type : tristate Prompt: Future Domain TMC-3260/AHA-2920A PCI SCSI support Location: -> Device Drivers -> SCSI device support -> SCSI low-level drivers (SCSI_LOWLEVEL [=y]) Defined at drivers/scsi/Kconfig:670 Depends on: SCSI_LOWLEVEL [=y] && PCI [=y] && SCSI [=y] Selects: SCSI_FDOMAIN [=m] -- Ondrej Zary
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 75f66f8ad3ea..dffe4b31e205 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -642,10 +642,6 @@ config SCSI_DMX3191D To compile this driver as a module, choose M here: the module will be called dmx3191d. -config SCSI_FDOMAIN - tristate - depends on SCSI - config SCSI_FDOMAIN_PCI tristate "Future Domain TMC-3260/AHA-2920A PCI SCSI support" depends on PCI && SCSI @@ -1527,6 +1523,10 @@ endif # SCSI_LOWLEVEL source "drivers/scsi/pcmcia/Kconfig" +config SCSI_FDOMAIN + tristate + depends on SCSI + source "drivers/scsi/device_handler/Kconfig" endmenu
We get a warning when CONFIG_SCSI_LOWLEVEL is disabled here: WARNING: unmet direct dependencies detected for SCSI_FDOMAIN Depends on [n]: SCSI_LOWLEVEL [=n] && SCSI [=y] Selected by [m]: - PCMCIA_FDOMAIN [=m] && SCSI_LOWLEVEL_PCMCIA [=y] && SCSI [=y] && PCMCIA [=y] && m && MODULES [=y] Move the common support outside of the SCSI_LOWLEVEL section. Alternatively, we could move all of SCSI_LOWLEVEL_PCMCIA into SCSI_LOWLEVEL. This would be more sensible, but might cause surprises for users that have SCSI_LOWLEVEL disabled. Fixes: 7d47fa065e62 ("scsi: fdomain: Add PCMCIA support") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/scsi/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.20.0