lkml.org 
[lkml]   [2022]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC v2 30/39] scsi: add HAS_IOPORT dependencies
    Date
    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/scsi/Kconfig | 19 ++++++++++---------
    drivers/scsi/aic7xxx/Kconfig.aic79xx | 2 +-
    drivers/scsi/aic7xxx/Kconfig.aic7xxx | 2 +-
    drivers/scsi/aic94xx/Kconfig | 2 +-
    drivers/scsi/megaraid/Kconfig.megaraid | 6 +++---
    drivers/scsi/mvsas/Kconfig | 2 +-
    drivers/scsi/qla2xxx/Kconfig | 2 +-
    7 files changed, 18 insertions(+), 17 deletions(-)

    diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
    index 6e3a04107bb6..40430aa8569b 100644
    --- a/drivers/scsi/Kconfig
    +++ b/drivers/scsi/Kconfig
    @@ -333,7 +333,7 @@ config SGIWD93_SCSI

    config BLK_DEV_3W_XXXX_RAID
    tristate "3ware 5/6/7/8xxx ATA-RAID support"
    - depends on PCI && SCSI
    + depends on PCI && HAS_IOPORT && SCSI
    help
    3ware is the only hardware ATA-Raid product in Linux to date.
    This card is 2,4, or 8 channel master mode support only.
    @@ -380,7 +380,7 @@ config SCSI_3W_SAS

    config SCSI_ACARD
    tristate "ACARD SCSI support"
    - depends on PCI && SCSI
    + depends on PCI && HAS_IOPORT && SCSI
    help
    This driver supports the ACARD SCSI host adapter.
    Support Chip <ATP870 ATP876 ATP880 ATP885>
    @@ -472,7 +472,7 @@ config SCSI_DPT_I2O
    config SCSI_ADVANSYS
    tristate "AdvanSys SCSI support"
    depends on SCSI
    - depends on ISA || EISA || PCI
    + depends on (ISA || EISA || PCI) && HAS_IOPORT
    depends on ISA_DMA_API || !ISA
    help
    This is a driver for all SCSI host adapters manufactured by
    @@ -643,7 +643,7 @@ config SCSI_SNIC_DEBUG_FS

    config SCSI_DMX3191D
    tristate "DMX3191D SCSI support"
    - depends on PCI && SCSI
    + depends on PCI && HAS_IOPORT && SCSI
    select SCSI_SPI_ATTRS
    help
    This is support for Domex DMX3191D SCSI Host Adapters.
    @@ -657,7 +657,7 @@ config SCSI_FDOMAIN

    config SCSI_FDOMAIN_PCI
    tristate "Future Domain TMC-3260/AHA-2920A PCI SCSI support"
    - depends on PCI && SCSI
    + depends on PCI && HAS_IOPORT && SCSI
    select SCSI_FDOMAIN
    help
    This is support for Future Domain's PCI SCSI host adapters (TMC-3260)
    @@ -710,7 +710,7 @@ config SCSI_GENERIC_NCR5380

    config SCSI_IPS
    tristate "IBM ServeRAID support"
    - depends on PCI && SCSI
    + depends on PCI && HAS_IOPORT && SCSI
    help
    This is support for the IBM ServeRAID hardware RAID controllers.
    See <http://www.developer.ibm.com/welcome/netfinity/serveraid.html>
    @@ -770,7 +770,7 @@ config SCSI_IBMVFC_TRACE

    config SCSI_INITIO
    tristate "Initio 9100U(W) support"
    - depends on PCI && SCSI
    + depends on PCI && HAS_IOPORT && SCSI
    help
    This is support for the Initio 91XXU(W) SCSI host adapter. Please
    read the SCSI-HOWTO, available from
    @@ -781,7 +781,7 @@ config SCSI_INITIO

    config SCSI_INIA100
    tristate "Initio INI-A100U2W support"
    - depends on PCI && SCSI
    + depends on PCI && HAS_IOPORT && SCSI
    help
    This is support for the Initio INI-A100U2W SCSI host adapter.
    Please read the SCSI-HOWTO, available from
    @@ -793,6 +793,7 @@ config SCSI_INIA100
    config SCSI_PPA
    tristate "IOMEGA parallel port (ppa - older drives)"
    depends on SCSI && PARPORT_PC
    + depends on HAS_IOPORT
    help
    This driver supports older versions of IOMEGA's parallel port ZIP
    drive (a 100 MB removable media device).
    @@ -1187,7 +1188,7 @@ config SCSI_SIM710

    config SCSI_DC395x
    tristate "Tekram DC395(U/UW/F) and DC315(U) SCSI support"
    - depends on PCI && SCSI
    + depends on PCI && HAS_IOPORT && SCSI
    select SCSI_SPI_ATTRS
    help
    This driver supports PCI SCSI host adapters based on the ASIC
    diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
    index a47dbd500e9a..4bc53eec4c83 100644
    --- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
    +++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
    @@ -5,7 +5,7 @@
    #
    config SCSI_AIC79XX
    tristate "Adaptec AIC79xx U320 support"
    - depends on PCI && SCSI
    + depends on PCI && HAS_IOPORT && SCSI
    select SCSI_SPI_ATTRS
    help
    This driver supports all of Adaptec's Ultra 320 PCI-X
    diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
    index 0cfd92ce750a..f0425145a5f4 100644
    --- a/drivers/scsi/aic7xxx/Kconfig.aic7xxx
    +++ b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
    @@ -5,7 +5,7 @@
    #
    config SCSI_AIC7XXX
    tristate "Adaptec AIC7xxx Fast -> U160 support"
    - depends on (PCI || EISA) && SCSI
    + depends on (PCI || EISA) && HAS_IOPORT && SCSI
    select SCSI_SPI_ATTRS
    help
    This driver supports all of Adaptec's Fast through Ultra 160 PCI
    diff --git a/drivers/scsi/aic94xx/Kconfig b/drivers/scsi/aic94xx/Kconfig
    index 71931c371b1c..aaa8dadc6e1c 100644
    --- a/drivers/scsi/aic94xx/Kconfig
    +++ b/drivers/scsi/aic94xx/Kconfig
    @@ -8,7 +8,7 @@

    config SCSI_AIC94XX
    tristate "Adaptec AIC94xx SAS/SATA support"
    - depends on PCI
    + depends on PCI && HAS_IOPORT
    select SCSI_SAS_LIBSAS
    select FW_LOADER
    help
    diff --git a/drivers/scsi/megaraid/Kconfig.megaraid b/drivers/scsi/megaraid/Kconfig.megaraid
    index 2adc2afd9f91..3f2ce1eb081c 100644
    --- a/drivers/scsi/megaraid/Kconfig.megaraid
    +++ b/drivers/scsi/megaraid/Kconfig.megaraid
    @@ -1,13 +1,13 @@
    # SPDX-License-Identifier: GPL-2.0-only
    config MEGARAID_NEWGEN
    bool "LSI Logic New Generation RAID Device Drivers"
    - depends on PCI && SCSI
    + depends on PCI && HAS_IOPORT && SCSI
    help
    LSI Logic RAID Device Drivers

    config MEGARAID_MM
    tristate "LSI Logic Management Module (New Driver)"
    - depends on PCI && SCSI && MEGARAID_NEWGEN
    + depends on PCI && HAS_IOPORT && SCSI && MEGARAID_NEWGEN
    help
    Management Module provides ioctl, sysfs support for LSI Logic
    RAID controllers.
    @@ -67,7 +67,7 @@ config MEGARAID_MAILBOX

    config MEGARAID_LEGACY
    tristate "LSI Logic Legacy MegaRAID Driver"
    - depends on PCI && SCSI
    + depends on PCI && HAS_IOPORT && SCSI
    help
    This driver supports the LSI MegaRAID 418, 428, 438, 466, 762, 490
    and 467 SCSI host adapters. This driver also support the all U320
    diff --git a/drivers/scsi/mvsas/Kconfig b/drivers/scsi/mvsas/Kconfig
    index 79812b80743b..5ac7fd593b17 100644
    --- a/drivers/scsi/mvsas/Kconfig
    +++ b/drivers/scsi/mvsas/Kconfig
    @@ -9,7 +9,7 @@

    config SCSI_MVSAS
    tristate "Marvell 88SE64XX/88SE94XX SAS/SATA support"
    - depends on PCI
    + depends on PCI && HAS_IOPORT
    select SCSI_SAS_LIBSAS
    select FW_LOADER
    help
    diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
    index 802c373fd6d9..a584708d3056 100644
    --- a/drivers/scsi/qla2xxx/Kconfig
    +++ b/drivers/scsi/qla2xxx/Kconfig
    @@ -1,7 +1,7 @@
    # SPDX-License-Identifier: GPL-2.0-only
    config SCSI_QLA_FC
    tristate "QLogic QLA2XXX Fibre Channel Support"
    - depends on PCI && SCSI
    + depends on PCI && HAS_IOPORT && SCSI
    depends on SCSI_FC_ATTRS
    depends on NVME_FC || !NVME_FC
    select FW_LOADER
    --
    2.32.0
    \
     
     \ /
      Last update: 2022-04-29 15:56    [W:3.098 / U:0.380 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site