| Message ID | 20210127104617.1173-7-nikita.shubin@maquefel.me |
|---|---|
| State | Superseded |
| Headers | show |
| Series | gpio: ep93xx: fixes series patch | expand |
Hello Nikita, On Wed, 2021-01-27 at 13:46 +0300, Nikita Shubin wrote: > - replace plain numbers with girq->num_parents in devm_kcalloc > - replace plain numbers with ARRAY_SIZE(girq->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> > --- > 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 8f66e3ca0cfb..e4270b4e5f26 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 < ARRAY_SIZE(girq->parents); i++) { Why do you use ARRAY_SIZE() here instead of ->num_parents like above? > + 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 8f66e3ca0cfb..e4270b4e5f26 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 < ARRAY_SIZE(girq->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 ARRAY_SIZE(girq->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> --- drivers/gpio/gpio-ep93xx.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)