| Message ID | 20210128122123.25341-7-nikita.shubin@maquefel.me |
|---|---|
| State | New |
| Headers | show |
| Series | gpio: ep93xx: fixes series patch | expand |
On Thu, Jan 28, 2021 at 2:21 PM Nikita Shubin <nikita.shubin@maquefel.me> wrote: > - replace plain numbers with girq->num_parents in devm_kcalloc devm_kcalloc() > - replace plain numbers with girq->num_parents for port F > - refactor i - 1 to i + 1 to make loop more readable > - combine getting IRQ's loop and setting handler's into single loop
On Thu, 2021-01-28 at 15:21 +0300, Nikita Shubin wrote: > - replace plain numbers with girq->num_parents in devm_kcalloc > - replace plain numbers with girq->num_parents for port F > - refactor i - 1 to i + 1 to make loop more readable > - combine getting IRQ's loop and setting handler's into single loop > > Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me> Acked-by: Alexander Sverdlin <alexander.sverdlin@gmail.com> > --- > v2->v3 > - use ->num_parents instead of ARRAY_SIZE() > --- > drivers/gpio/gpio-ep93xx.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c > index d69ec09cd618..df55aa13bd9a 100644 > --- a/drivers/gpio/gpio-ep93xx.c > +++ b/drivers/gpio/gpio-ep93xx.c > @@ -384,7 +384,7 @@ static int ep93xx_gpio_add_bank(struct gpio_chip > *gc, > > girq->parent_handler = ep93xx_gpio_ab_irq_handler; > girq->num_parents = 1; > - girq->parents = devm_kcalloc(dev, 1, > + girq->parents = devm_kcalloc(dev, girq->num_parents, > sizeof(*girq->parents), > GFP_KERNEL); > if (!girq->parents) > @@ -406,15 +406,14 @@ static int ep93xx_gpio_add_bank(struct > gpio_chip *gc, > */ > girq->parent_handler = ep93xx_gpio_f_irq_handler; > girq->num_parents = 8; > - girq->parents = devm_kcalloc(dev, 8, > + girq->parents = devm_kcalloc(dev, girq->num_parents, > sizeof(*girq->parents), > GFP_KERNEL); > if (!girq->parents) > return -ENOMEM; > /* Pick resources 1..8 for these IRQs */ > - for (i = 1; i <= 8; i++) > - girq->parents[i - 1] = platform_get_irq(pdev, > i); > - for (i = 0; i < 8; i++) { > + for (i = 0; i < girq->num_parents; i++) { > + girq->parents[i] = platform_get_irq(pdev, i + > 1); > gpio_irq = EP93XX_GPIO_F_IRQ_BASE + i; > irq_set_chip_data(gpio_irq, &epg->gc[5]); > irq_set_chip_and_handler(gpio_irq,
diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c index d69ec09cd618..df55aa13bd9a 100644 --- a/drivers/gpio/gpio-ep93xx.c +++ b/drivers/gpio/gpio-ep93xx.c @@ -384,7 +384,7 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, girq->parent_handler = ep93xx_gpio_ab_irq_handler; girq->num_parents = 1; - girq->parents = devm_kcalloc(dev, 1, + girq->parents = devm_kcalloc(dev, girq->num_parents, sizeof(*girq->parents), GFP_KERNEL); if (!girq->parents) @@ -406,15 +406,14 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, */ girq->parent_handler = ep93xx_gpio_f_irq_handler; girq->num_parents = 8; - girq->parents = devm_kcalloc(dev, 8, + girq->parents = devm_kcalloc(dev, girq->num_parents, sizeof(*girq->parents), GFP_KERNEL); if (!girq->parents) return -ENOMEM; /* Pick resources 1..8 for these IRQs */ - for (i = 1; i <= 8; i++) - girq->parents[i - 1] = platform_get_irq(pdev, i); - for (i = 0; i < 8; i++) { + for (i = 0; i < girq->num_parents; i++) { + girq->parents[i] = platform_get_irq(pdev, i + 1); gpio_irq = EP93XX_GPIO_F_IRQ_BASE + i; irq_set_chip_data(gpio_irq, &epg->gc[5]); irq_set_chip_and_handler(gpio_irq,
- replace plain numbers with girq->num_parents in devm_kcalloc - replace plain numbers with girq->num_parents for port F - refactor i - 1 to i + 1 to make loop more readable - combine getting IRQ's loop and setting handler's into single loop Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me> --- v2->v3 - use ->num_parents instead of ARRAY_SIZE() --- drivers/gpio/gpio-ep93xx.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)