lkml.org 
[lkml]   [2022]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 485/545] serial: 8250_pci: Refactor the loop in pci_ite887x_init()
    Date
    From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

    [ Upstream commit 35b4f17231923e2f64521bdf7a2793ce2c3c74a6 ]

    The loop can be refactored by using ARRAY_SIZE() instead of NULL terminator.
    This reduces code base and makes it easier to read and understand.

    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Reviewed-by: Jiri Slaby <jslaby@kernel.org>
    Link: https://lore.kernel.org/r/20211022135147.70965-1-andriy.shevchenko@linux.intel.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/tty/serial/8250/8250_pci.c | 12 ++++--------
    1 file changed, 4 insertions(+), 8 deletions(-)

    diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
    index bdc262b4109c..7ce755b47a3d 100644
    --- a/drivers/tty/serial/8250/8250_pci.c
    +++ b/drivers/tty/serial/8250/8250_pci.c
    @@ -897,18 +897,16 @@ static int pci_netmos_init(struct pci_dev *dev)
    /* enable IO_Space bit */
    #define ITE_887x_POSIO_ENABLE (1 << 31)

    +/* inta_addr are the configuration addresses of the ITE */
    +static const short inta_addr[] = { 0x2a0, 0x2c0, 0x220, 0x240, 0x1e0, 0x200, 0x280 };
    static int pci_ite887x_init(struct pci_dev *dev)
    {
    - /* inta_addr are the configuration addresses of the ITE */
    - static const short inta_addr[] = { 0x2a0, 0x2c0, 0x220, 0x240, 0x1e0,
    - 0x200, 0x280, 0 };
    int ret, i, type;
    struct resource *iobase = NULL;
    u32 miscr, uartbar, ioport;

    /* search for the base-ioport */
    - i = 0;
    - while (inta_addr[i] && iobase == NULL) {
    + for (i = 0; i < ARRAY_SIZE(inta_addr); i++) {
    iobase = request_region(inta_addr[i], ITE_887x_IOSIZE,
    "ite887x");
    if (iobase != NULL) {
    @@ -925,12 +923,10 @@ static int pci_ite887x_init(struct pci_dev *dev)
    break;
    }
    release_region(iobase->start, ITE_887x_IOSIZE);
    - iobase = NULL;
    }
    - i++;
    }

    - if (!inta_addr[i]) {
    + if (i == ARRAY_SIZE(inta_addr)) {
    dev_err(&dev->dev, "ite887x: could not find iobase\n");
    return -ENODEV;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-21 13:14    [W:3.033 / U:2.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site