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 22/39] parport: PC style parport depends on HAS_IOPORT
    Date
    In a future patch HAS_IOPORT=n will result in inb()/outb() and friends
    not being declared. As PC style parport uses these functions we need to
    handle this dependency.

    Co-developed-by: Arnd Bergmann <arnd@kernel.org>
    Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
    ---
    drivers/parport/Kconfig | 4 ++--
    include/linux/parport.h | 2 +-
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
    index 68a4fe4cd60b..31c8ec2df449 100644
    --- a/drivers/parport/Kconfig
    +++ b/drivers/parport/Kconfig
    @@ -14,7 +14,6 @@ config ARCH_MIGHT_HAVE_PC_PARPORT

    menuconfig PARPORT
    tristate "Parallel port support"
    - depends on HAS_IOMEM
    help
    If you want to use devices connected to your machine's parallel port
    (the connector at the computer with 25 holes), e.g. printer, ZIP
    @@ -42,7 +41,8 @@ if PARPORT

    config PARPORT_PC
    tristate "PC-style hardware"
    - depends on ARCH_MIGHT_HAVE_PC_PARPORT || (PCI && !S390)
    + depends on ARCH_MIGHT_HAVE_PC_PARPORT
    + depends on HAS_IOPORT
    help
    You should say Y here if you have a PC-style parallel port. All
    IBM PC compatible computers and some Alphas have PC-style
    diff --git a/include/linux/parport.h b/include/linux/parport.h
    index 1c16ffb8b908..04ca5dc597a1 100644
    --- a/include/linux/parport.h
    +++ b/include/linux/parport.h
    @@ -519,7 +519,7 @@ extern int parport_device_proc_register(struct pardevice *device);
    extern int parport_device_proc_unregister(struct pardevice *device);

    /* If PC hardware is the only type supported, we can optimise a bit. */
    -#if !defined(CONFIG_PARPORT_NOT_PC)
    +#if !defined(CONFIG_PARPORT_NOT_PC) && defined(CONFIG_PARPORT_PC)

    #include <linux/parport_pc.h>
    #define parport_write_data(p,x) parport_pc_write_data(p,x)
    --
    2.32.0
    \
     
     \ /
      Last update: 2022-04-29 15:54    [W:3.918 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site