| Message ID | 621cf12492b03bb251d30078ae1594788d74529f.1661789204.git.christophe.leroy@csgroup.eu |
|---|---|
| State | New |
| Headers | show |
| Series | gpio: Get rid of ARCH_NR_GPIOS (v1) | expand |
Hi Christophe, On Mon, Aug 29, 2022 at 6:15 PM Christophe Leroy <christophe.leroy@csgroup.eu> wrote: > ARCH_NR_GPIOS is used locally in aggr_parse() as the maximum number > of GPIOs to be aggregated together by the driver since > commit ec75039d5550 ("gpio: aggregator: Use bitmap_parselist() for > parsing GPIO offsets"). > > Don't rely on the total possible number of GPIOs in the system but > define a local arbitrary macro for that, set to 512 which should be > large enough as it is also the default value for ARCH_NR_GPIOS. > > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Thanks for your patch! > --- a/drivers/gpio/gpio-aggregator.c > +++ b/drivers/gpio/gpio-aggregator.c > @@ -56,6 +56,8 @@ static int aggr_add_gpio(struct gpio_aggregator *aggr, const char *key, > return 0; > } > > +#define AGGREGATOR_MAX_GPIOS 512 I would insert this definition at the top, so it is not buried inside the code, and easier to spot. > + > static int aggr_parse(struct gpio_aggregator *aggr) > { > char *args = skip_spaces(aggr->args); The rest LGTM, so Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --git a/drivers/gpio/gpio-aggregator.c b/drivers/gpio/gpio-aggregator.c index 0cb2664085cf..4548da542ad2 100644 --- a/drivers/gpio/gpio-aggregator.c +++ b/drivers/gpio/gpio-aggregator.c @@ -56,6 +56,8 @@ static int aggr_add_gpio(struct gpio_aggregator *aggr, const char *key, return 0; } +#define AGGREGATOR_MAX_GPIOS 512 + static int aggr_parse(struct gpio_aggregator *aggr) { char *args = skip_spaces(aggr->args); @@ -64,7 +66,7 @@ static int aggr_parse(struct gpio_aggregator *aggr) unsigned int i, n = 0; int error = 0; - bitmap = bitmap_alloc(ARCH_NR_GPIOS, GFP_KERNEL); + bitmap = bitmap_alloc(AGGREGATOR_MAX_GPIOS, GFP_KERNEL); if (!bitmap) return -ENOMEM; @@ -84,13 +86,13 @@ static int aggr_parse(struct gpio_aggregator *aggr) } /* GPIO chip + offset(s) */ - error = bitmap_parselist(offsets, bitmap, ARCH_NR_GPIOS); + error = bitmap_parselist(offsets, bitmap, AGGREGATOR_MAX_GPIOS); if (error) { pr_err("Cannot parse %s: %d\n", offsets, error); goto free_bitmap; } - for_each_set_bit(i, bitmap, ARCH_NR_GPIOS) { + for_each_set_bit(i, bitmap, AGGREGATOR_MAX_GPIOS) { error = aggr_add_gpio(aggr, name, i, &n); if (error) goto free_bitmap;
ARCH_NR_GPIOS is used locally in aggr_parse() as the maximum number of GPIOs to be aggregated together by the driver since commit ec75039d5550 ("gpio: aggregator: Use bitmap_parselist() for parsing GPIO offsets"). Don't rely on the total possible number of GPIOs in the system but define a local arbitrary macro for that, set to 512 which should be large enough as it is also the default value for ARCH_NR_GPIOS. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- drivers/gpio/gpio-aggregator.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)