[PATCH v2] gpio: mmio: handle "ngpios" properly in bgpio_init()

From: Asmaa Mnebhi
Date: Fri Feb 24 2023 - 14:20:45 EST


bgpio_init() uses "sz" argument to populate ngpio, which is not
accurate. Instead, read the "ngpios" property from the DT and if it
doesn't exist, use the "sz" argument. With this change, drivers no
longer need to overwrite the ngpio variable after calling bgpio_init.

Signed-off-by: Asmaa Mnebhi <asmaa@xxxxxxxxxx>
---
drivers/gpio/gpio-mmio.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpio/gpio-mmio.c b/drivers/gpio/gpio-mmio.c
index d9dff3dc92ae..448fefc4468c 100644
--- a/drivers/gpio/gpio-mmio.c
+++ b/drivers/gpio/gpio-mmio.c
@@ -614,10 +614,13 @@ int bgpio_init(struct gpio_chip *gc, struct device *dev,
gc->parent = dev;
gc->label = dev_name(dev);
gc->base = -1;
- gc->ngpio = gc->bgpio_bits;
gc->request = bgpio_request;
gc->be_bits = !!(flags & BGPIOF_BIG_ENDIAN);

+ ret = device_property_present(dev, "ngpios");
+ if (!ret)
+ gc->ngpio = gc->bgpio_bits;
+
ret = bgpio_setup_io(gc, dat, set, clr, flags);
if (ret)
return ret;
--
2.30.1