From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: mfe@pengutronix.de, Jules Maselbas <jmaselbas@kalray.eu>,
Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH v2 07/10] gpiolib: introduce of_gpiochip_add to bundle all of functions
Date: Wed, 14 Jun 2023 12:07:44 +0200 [thread overview]
Message-ID: <20230614100747.3368109-8-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20230614100747.3368109-1-a.fatoum@pengutronix.de>
From: Marco Felsch <m.felsch@pengutronix.de>
Introduce a common OF related function which does all the OF related
part. This allow us to drop the santity checks and harmonizes the code
with the linux kernel.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2:
- no change
---
drivers/gpio/gpiolib.c | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 97d1a6d6687f..5e753d1c7300 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -517,9 +517,6 @@ static int of_gpiochip_scan_hogs(struct gpio_chip *chip)
struct device_node *np;
int ret, i;
- if (!IS_ENABLED(CONFIG_OFDEVICE) || !chip->dev->of_node)
- return 0;
-
for_each_available_child_of_node(chip->dev->of_node, np) {
if (!of_property_read_bool(np, "gpio-hog"))
continue;
@@ -550,15 +547,10 @@ static int of_gpiochip_scan_hogs(struct gpio_chip *chip)
*/
static int of_gpiochip_set_names(struct gpio_chip *chip)
{
- struct device *dev = chip->dev;
- struct device_node *np;
+ struct device_node *np = dev_of_node(chip->dev);
const char **names;
int ret, i, count;
- np = dev_of_node(dev);
- if (!np)
- return 0;
-
count = of_property_count_strings(np, "gpio-line-names");
if (count < 0)
return 0;
@@ -598,6 +590,22 @@ static int of_gpiochip_set_names(struct gpio_chip *chip)
return 0;
}
+static int of_gpiochip_add(struct gpio_chip *chip)
+{
+ struct device_node *np;
+ int ret;
+
+ np = dev_of_node(chip->dev);
+ if (!np)
+ return 0;
+
+ ret = of_gpiochip_set_names(chip);
+ if (ret)
+ return ret;
+
+ return of_gpiochip_scan_hogs(chip);
+}
+
#ifdef CONFIG_OFDEVICE
static const char *gpio_suffixes[] = {
"gpios",
@@ -659,7 +667,6 @@ int dev_gpiod_get_index(struct device *dev,
int gpiochip_add(struct gpio_chip *chip)
{
- int ret;
int i;
if (chip->base >= 0) {
@@ -679,11 +686,7 @@ int gpiochip_add(struct gpio_chip *chip)
for (i = chip->base; i < chip->base + chip->ngpio; i++)
gpio_desc[i].chip = chip;
- ret = of_gpiochip_set_names(chip);
- if (ret)
- return ret;
-
- return of_gpiochip_scan_hogs(chip);
+ return of_gpiochip_add(chip);
}
void gpiochip_remove(struct gpio_chip *chip)
--
2.39.2
next prev parent reply other threads:[~2023-06-14 10:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-14 10:07 [PATCH v2 00/10] Fix gpio-hogs and sync with Linux gpiolib Ahmad Fatoum
2023-06-14 10:07 ` [PATCH v2 01/10] gpiolib: fix gpio-hog functionality Ahmad Fatoum
2023-06-14 10:07 ` [PATCH v2 02/10] gpiolib: simplify for loop break condition Ahmad Fatoum
2023-06-14 10:07 ` [PATCH v2 03/10] gpiolib: rename local gpio-line-names variable Ahmad Fatoum
2023-06-14 10:07 ` [PATCH v2 04/10] gpiolib: fix gpio name memory leak Ahmad Fatoum
2023-06-14 10:07 ` [PATCH v2 05/10] gpiolib: fix missing error check while query gpio-line-names Ahmad Fatoum
2023-06-14 10:07 ` [PATCH v2 06/10] gpiolib: refactor gpio-line-names parsing Ahmad Fatoum
2023-06-14 10:07 ` Ahmad Fatoum [this message]
2023-06-14 10:07 ` [PATCH v2 08/10] OF: gpio: sync of_get_named_gpio_flags variable with kernel Ahmad Fatoum
2023-06-14 10:07 ` [PATCH v2 09/10] OF: gpio: call of_node_put in of_get_named_gpio_flags Ahmad Fatoum
2023-06-14 10:07 ` [PATCH v2 10/10] gpiolib: add of_xlate support Ahmad Fatoum
2023-06-16 8:14 ` Sascha Hauer
2023-06-16 12:13 ` Marco Felsch
2023-06-14 14:19 ` [PATCH v2 00/10] Fix gpio-hogs and sync with Linux gpiolib Sascha Hauer
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=20230614100747.3368109-8-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=jmaselbas@kalray.eu \
--cc=mfe@pengutronix.de \
/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