lkml.org 
[lkml]   [2023]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 4/4] pcmcia: Convert to use pci_bus_for_each_resource_p()
    Date
    The pci_bus_for_each_resource_p() hides the iterator loop since
    it may be not used otherwise. With this, we may drop that iterator
    variable definition.

    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Reviewed-by: Krzysztof Wilczyński <kw@linux.com>
    Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
    ---
    drivers/pcmcia/rsrc_nonstatic.c | 9 +++------
    drivers/pcmcia/yenta_socket.c | 3 +--
    2 files changed, 4 insertions(+), 8 deletions(-)

    diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
    index ad1141fddb4c..9d92d4bb6239 100644
    --- a/drivers/pcmcia/rsrc_nonstatic.c
    +++ b/drivers/pcmcia/rsrc_nonstatic.c
    @@ -934,7 +934,7 @@ static int adjust_io(struct pcmcia_socket *s, unsigned int action, unsigned long
    static int nonstatic_autoadd_resources(struct pcmcia_socket *s)
    {
    struct resource *res;
    - int i, done = 0;
    + int done = 0;

    if (!s->cb_dev || !s->cb_dev->bus)
    return -ENODEV;
    @@ -960,12 +960,9 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s)
    */
    if (s->cb_dev->bus->number == 0)
    return -EINVAL;
    -
    - for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) {
    - res = s->cb_dev->bus->resource[i];
    -#else
    - pci_bus_for_each_resource(s->cb_dev->bus, res, i) {
    #endif
    +
    + pci_bus_for_each_resource_p(s->cb_dev->bus, res) {
    if (!res)
    continue;

    diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
    index 1365eaa20ff4..2e5bdf3db0ba 100644
    --- a/drivers/pcmcia/yenta_socket.c
    +++ b/drivers/pcmcia/yenta_socket.c
    @@ -673,9 +673,8 @@ static int yenta_search_res(struct yenta_socket *socket, struct resource *res,
    u32 min)
    {
    struct resource *root;
    - int i;

    - pci_bus_for_each_resource(socket->dev->bus, root, i) {
    + pci_bus_for_each_resource_p(socket->dev->bus, root) {
    if (!root)
    continue;

    --
    2.39.2
    \
     
     \ /
      Last update: 2023-03-27 01:00    [W:2.839 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site