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[PATCH 08/37] comedi: 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/comedi/Kconfig | 36 ++++++++++++++++++++++++++++++++++--
    1 file changed, 34 insertions(+), 2 deletions(-)

    diff --git a/drivers/comedi/Kconfig b/drivers/comedi/Kconfig
    index 3cb61fa2c5c3..0159921002b8 100644
    --- a/drivers/comedi/Kconfig
    +++ b/drivers/comedi/Kconfig
    @@ -67,6 +67,7 @@ config COMEDI_TEST

    config COMEDI_PARPORT
    tristate "Parallel port support"
    + depends on HAS_IOPORT
    help
    Enable support for the standard parallel port.
    A cheap and easy way to get a few more digital I/O lines. Steal
    @@ -79,6 +80,7 @@ config COMEDI_PARPORT
    config COMEDI_SSV_DNP
    tristate "SSV Embedded Systems DIL/Net-PC support"
    depends on X86_32 || COMPILE_TEST
    + depends on HAS_IOPORT
    help
    Enable support for SSV Embedded Systems DIL/Net-PC

    @@ -89,6 +91,7 @@ endif # COMEDI_MISC_DRIVERS

    menuconfig COMEDI_ISA_DRIVERS
    bool "Comedi ISA and PC/104 drivers"
    + depends on ISA
    help
    Enable comedi ISA and PC/104 drivers to be built

    @@ -100,6 +103,7 @@ if COMEDI_ISA_DRIVERS

    config COMEDI_PCL711
    tristate "Advantech PCL-711/711b and ADlink ACL-8112 ISA card support"
    + depends on HAS_IOPORT
    select COMEDI_8254
    help
    Enable support for Advantech PCL-711 and 711b, ADlink ACL-8112
    @@ -161,6 +165,7 @@ config COMEDI_PCL730

    config COMEDI_PCL812
    tristate "Advantech PCL-812/813 and ADlink ACL-8112/8113/8113/8216"
    + depends on HAS_IOPORT
    select COMEDI_ISADMA if ISA_DMA_API
    select COMEDI_8254
    help
    @@ -173,6 +178,7 @@ config COMEDI_PCL812

    config COMEDI_PCL816
    tristate "Advantech PCL-814 and PCL-816 ISA card support"
    + depends on HAS_IOPORT
    select COMEDI_ISADMA if ISA_DMA_API
    select COMEDI_8254
    help
    @@ -183,6 +189,7 @@ config COMEDI_PCL816

    config COMEDI_PCL818
    tristate "Advantech PCL-718 and PCL-818 ISA card support"
    + depends on HAS_IOPORT
    select COMEDI_ISADMA if ISA_DMA_API
    select COMEDI_8254
    help
    @@ -255,6 +262,7 @@ config COMEDI_DAC02

    config COMEDI_DAS16M1
    tristate "MeasurementComputing CIO-DAS16/M1DAS-16 ISA card support"
    + depends on HAS_IOPORT
    select COMEDI_8254
    select COMEDI_8255
    help
    @@ -278,6 +286,7 @@ config COMEDI_DAS08_ISA

    config COMEDI_DAS16
    tristate "DAS-16 compatible ISA and PC/104 card support"
    + depends on HAS_IOPORT
    select COMEDI_ISADMA if ISA_DMA_API
    select COMEDI_8254
    select COMEDI_8255
    @@ -296,6 +305,7 @@ config COMEDI_DAS16

    config COMEDI_DAS800
    tristate "DAS800 and compatible ISA card support"
    + depends on HAS_IOPORT
    select COMEDI_8254
    help
    Enable support for Keithley Metrabyte DAS800 and compatible ISA cards
    @@ -308,6 +318,7 @@ config COMEDI_DAS800

    config COMEDI_DAS1800
    tristate "DAS1800 and compatible ISA card support"
    + depends on HAS_IOPORT
    select COMEDI_ISADMA if ISA_DMA_API
    select COMEDI_8254
    help
    @@ -323,6 +334,7 @@ config COMEDI_DAS1800

    config COMEDI_DAS6402
    tristate "DAS6402 and compatible ISA card support"
    + depends on HAS_IOPORT
    select COMEDI_8254
    help
    Enable support for DAS6402 and compatible ISA cards
    @@ -402,6 +414,7 @@ config COMEDI_FL512

    config COMEDI_AIO_AIO12_8
    tristate "I/O Products PC/104 AIO12-8 Analog I/O Board support"
    + depends on HAS_IOPORT
    select COMEDI_8254
    select COMEDI_8255
    help
    @@ -456,6 +469,7 @@ config COMEDI_ADQ12B

    config COMEDI_NI_AT_A2150
    tristate "NI AT-A2150 ISA card support"
    + depends on HAS_IOPORT
    select COMEDI_ISADMA if ISA_DMA_API
    select COMEDI_8254
    help
    @@ -466,6 +480,7 @@ config COMEDI_NI_AT_A2150

    config COMEDI_NI_AT_AO
    tristate "NI AT-AO-6/10 EISA card support"
    + depends on HAS_IOPORT
    select COMEDI_8254
    help
    Enable support for National Instruments AT-AO-6/10 cards
    @@ -561,7 +576,7 @@ endif # COMEDI_ISA_DRIVERS

    menuconfig COMEDI_PCI_DRIVERS
    tristate "Comedi PCI drivers"
    - depends on PCI
    + depends on PCI && HAS_IOPORT
    help
    Enable support for comedi PCI drivers.

    @@ -710,6 +725,7 @@ config COMEDI_ADL_PCI8164

    config COMEDI_ADL_PCI9111
    tristate "ADLink PCI-9111HR support"
    + depends on HAS_IOPORT
    select COMEDI_8254
    help
    Enable support for ADlink PCI9111 cards
    @@ -729,6 +745,7 @@ config COMEDI_ADL_PCI9118

    config COMEDI_ADV_PCI1710
    tristate "Advantech PCI-171x and PCI-1731 support"
    + depends on HAS_IOPORT
    select COMEDI_8254
    help
    Enable support for Advantech PCI-1710, PCI-1710HG, PCI-1711,
    @@ -773,6 +790,7 @@ config COMEDI_ADV_PCI1760

    config COMEDI_ADV_PCI_DIO
    tristate "Advantech PCI DIO card support"
    + depends on HAS_IOPORT
    select COMEDI_8254
    select COMEDI_8255
    help
    @@ -814,6 +832,7 @@ config COMEDI_AMPLC_PC263_PCI

    config COMEDI_AMPLC_PCI224
    tristate "Amplicon PCI224 and PCI234 support"
    + depends on HAS_IOPORT
    select COMEDI_8254
    help
    Enable support for Amplicon PCI224 and PCI234 AO boards
    @@ -823,6 +842,7 @@ config COMEDI_AMPLC_PCI224

    config COMEDI_AMPLC_PCI230
    tristate "Amplicon PCI230 and PCI260 support"
    + depends on HAS_IOPORT
    select COMEDI_8254
    select COMEDI_8255
    help
    @@ -929,6 +949,7 @@ config COMEDI_CB_PCIDAS64

    config COMEDI_CB_PCIDAS
    tristate "MeasurementComputing PCI-DAS support"
    + depends on HAS_IOPORT
    select COMEDI_8254
    select COMEDI_8255
    help
    @@ -953,6 +974,7 @@ config COMEDI_CB_PCIDDA

    config COMEDI_CB_PCIMDAS
    tristate "MeasurementComputing PCIM-DAS1602/16, PCIe-DAS1602/16 support"
    + depends on HAS_IOPORT
    select COMEDI_8254
    select COMEDI_8255
    help
    @@ -973,6 +995,7 @@ config COMEDI_CB_PCIMDDA

    config COMEDI_ME4000
    tristate "Meilhaus ME-4000 support"
    + depends on HAS_IOPORT
    select COMEDI_8254
    help
    Enable support for Meilhaus PCI data acquisition cards
    @@ -1053,6 +1076,7 @@ config COMEDI_NI_PCIDIO
    config COMEDI_NI_PCIMIO
    tristate "NI PCI-MIO-E series and M series support"
    depends on HAS_DMA
    + depends on HAS_IOPORT
    select COMEDI_NI_TIOCMD
    select COMEDI_8255
    help
    @@ -1074,6 +1098,8 @@ config COMEDI_NI_PCIMIO

    config COMEDI_RTD520
    tristate "Real Time Devices PCI4520/DM7520 support"
    + depends on HAS_IOPORT
    + depends on HAS_IOPORT
    select COMEDI_8254
    help
    Enable support for Real Time Devices PCI4520/DM7520
    @@ -1114,6 +1140,7 @@ if COMEDI_PCMCIA_DRIVERS

    config COMEDI_CB_DAS16_CS
    tristate "CB DAS16 series PCMCIA support"
    + depends on HAS_IOPORT
    select COMEDI_8254
    help
    Enable support for the ComputerBoards/MeasurementComputing PCMCIA
    @@ -1142,6 +1169,7 @@ config COMEDI_NI_DAQ_700_CS

    config COMEDI_NI_DAQ_DIO24_CS
    tristate "NI DAQ-Card DIO-24 PCMCIA support"
    + depends on HAS_IOPORT
    select COMEDI_8255
    help
    Enable support for the National Instruments PCMCIA DAQ-Card DIO-24
    @@ -1160,6 +1188,7 @@ config COMEDI_NI_LABPC_CS

    config COMEDI_NI_MIO_CS
    tristate "NI DAQCard E series PCMCIA support"
    + depends on HAS_IOPORT
    select COMEDI_NI_TIO
    select COMEDI_8255
    help
    @@ -1248,12 +1277,14 @@ endif # COMEDI_USB_DRIVERS

    config COMEDI_8254
    tristate
    + depends on HAS_IOPORT

    config COMEDI_8255
    tristate

    config COMEDI_8255_SA
    tristate "Standalone 8255 support"
    + depends on HAS_IOPORT
    select COMEDI_8255
    help
    Enable support for 8255 digital I/O as a standalone driver.
    @@ -1285,8 +1316,8 @@ config COMEDI_KCOMEDILIB
    called kcomedilib.

    config COMEDI_AMPLC_DIO200
    - select COMEDI_8254
    tristate
    + select COMEDI_8254

    config COMEDI_AMPLC_PC236
    tristate
    @@ -1302,6 +1333,7 @@ config COMEDI_ISADMA

    config COMEDI_NI_LABPC
    tristate
    + depends on HAS_IOPORT
    select COMEDI_8254
    select COMEDI_8255

    --
    2.32.0
    \
     
     \ /
      Last update: 2022-04-29 15:52    [W:4.356 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site