From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Linus Walleij <linus.walleij@linaro.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
Bartosz Golaszewski <brgl@bgdev.pl>
Subject: [PATCH RFC 2/2] gpiolib: check the 'ngpios' property in core gpiolib code
Date: Thu, 11 Nov 2021 21:25:06 +0100 [thread overview]
Message-ID: <20211111202506.19459-2-brgl@bgdev.pl> (raw)
In-Reply-To: <20211111202506.19459-1-brgl@bgdev.pl>
Several drivers read the 'ngpios' device property on their own, but
since it's defined as a standard GPIO property in the device tree bindings
anyway, it's a good candidate for generalization. If the driver didn't
set its gc->ngpio, try to read the 'ngpios' property from the GPIO
device's firmware node before bailing out.
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/gpio/gpiolib.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 4c34c96ef136..23b0478163d4 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -598,6 +598,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,
struct gpio_device *gdev;
unsigned long flags;
unsigned int i;
+ u32 ngpios;
/*
* First: allocate and populate the internal stat container, and
@@ -646,9 +647,15 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,
}
if (gc->ngpio == 0) {
- chip_err(gc, "tried to insert a GPIO chip with zero lines\n");
- ret = -EINVAL;
- goto err_free_descs;
+ ret = fwnode_property_read_u32(gdev->dev.fwnode, "ngpios",
+ &ngpios);
+ if (ret == 0) {
+ gc->ngpio = ngpios;
+ } else {
+ chip_err(gc, "tried to insert a GPIO chip with zero lines\n");
+ ret = -EINVAL;
+ goto err_free_descs;
+ }
}
if (gc->ngpio > FASTPATH_NGPIO)
--
2.30.1
next prev parent reply other threads:[~2021-11-11 20:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-11 20:25 [PATCH 1/2] gpiolib: improve coding style for local variables Bartosz Golaszewski
2021-11-11 20:25 ` Bartosz Golaszewski [this message]
2021-11-11 20:31 ` [PATCH RFC 2/2] gpiolib: check the 'ngpios' property in core gpiolib code Linus Walleij
2021-11-11 20:47 ` Andy Shevchenko
2021-11-12 14:48 ` Bartosz Golaszewski
2021-11-12 15:07 ` Andy Shevchenko
2021-11-11 20:29 ` [PATCH 1/2] gpiolib: improve coding style for local variables Linus Walleij
2021-11-11 20:30 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211111202506.19459-2-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox