lkml.org 
[lkml]   [2023]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 19/44] misc: 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: Arnd Bergmann <arnd@kernel.org>
    Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
    ---
    drivers/misc/altera-stapl/Makefile | 3 ++-
    drivers/misc/altera-stapl/altera.c | 6 +++++-
    2 files changed, 7 insertions(+), 2 deletions(-)

    diff --git a/drivers/misc/altera-stapl/Makefile b/drivers/misc/altera-stapl/Makefile
    index dd0f8189666b..90f18e7bf9b0 100644
    --- a/drivers/misc/altera-stapl/Makefile
    +++ b/drivers/misc/altera-stapl/Makefile
    @@ -1,4 +1,5 @@
    # SPDX-License-Identifier: GPL-2.0-only
    -altera-stapl-objs = altera-lpt.o altera-jtag.o altera-comp.o altera.o
    +altera-stapl-y = altera-jtag.o altera-comp.o altera.o
    +altera-stapl-$(CONFIG_HAS_IOPORT) += altera-lpt.o

    obj-$(CONFIG_ALTERA_STAPL) += altera-stapl.o
    diff --git a/drivers/misc/altera-stapl/altera.c b/drivers/misc/altera-stapl/altera.c
    index a58b7cb81d98..587427b73914 100644
    --- a/drivers/misc/altera-stapl/altera.c
    +++ b/drivers/misc/altera-stapl/altera.c
    @@ -2407,6 +2407,10 @@ int altera_init(struct altera_config *config, const struct firmware *fw)

    astate->config = config;
    if (!astate->config->jtag_io) {
    + if (!IS_ENABLED(CONFIG_HAS_IOPORT)) {
    + retval = -ENODEV;
    + goto free_state;
    + }
    dprintk("%s: using byteblaster!\n", __func__);
    astate->config->jtag_io = netup_jtag_io_lpt;
    }
    @@ -2481,7 +2485,7 @@ int altera_init(struct altera_config *config, const struct firmware *fw)

    } else if (exec_result)
    printk(KERN_ERR "%s: error %d\n", __func__, exec_result);
    -
    +free_state:
    kfree(astate);
    free_value:
    kfree(value);
    --
    2.39.2
    \
     
     \ /
      Last update: 2023-05-22 12:53    [W:2.399 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site