Skip to contentSkip to conversation

gpiolib: of: Prepare of_mm_gpiochip_add_data() for fwnode

PATCH In review Andy Shevchenko 3 participants 4 messages Nov 14, 2022 – Nov 15, 2022 GPIO

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 gpiolib: of: Prepare of_mm_gpiochip_add_data() for fwnode

GPIO library is getting rid of of_node, fwnode should be utilized instead. Prepare of_mm_gpiochip_add_data() for fwnode.

---
v2: added tag (Linus), modified according to Dmitry's suggestion

 drivers/gpio/gpiolib-of.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpio/gpiolib-of.c +2 -2
index 4be3c21aa718..d30a5210dfdd 100644
@@ -935,8 +935,8 @@ int of_mm_gpiochip_add_data(struct device_node *np,
 	if (mm_gc->save_regs)
 		mm_gc->save_regs(mm_gc);
 
-	of_node_put(mm_gc->gc.of_node);
-	mm_gc->gc.of_node = of_node_get(np);
+	fwnode_handle_put(mm_gc->gc.fwnode);
+	mm_gc->gc.fwnode = fwnode_handle_get(of_fwnode_handle(np));
 
 	ret = gpiochip_add_data(gc, data);
 	if (ret)

base-commit: 8dab99c9eab3162bfb4326c35579a3388dbf68f2

Signature · 1 line
2.35.1
#1 lore raw

PATCH v2 2/2 gpiolib: of: Drop redundant check in of_mm_gpiochip_remove()

The callers never call the function with invalid pointer. Moreover, compiler quite likely dropped that check anyway because we use that pointer before the check.

---
v2: added tags (Linus, Dmitry)

 drivers/gpio/gpiolib-of.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/gpio/gpiolib-of.c +0 -3
index d30a5210dfdd..f96cb6fe6831 100644
@@ -962,9 +962,6 @@ void of_mm_gpiochip_remove(struct of_mm_gpio_chip *mm_gc)
 {
 	struct gpio_chip *gc = &mm_gc->gc;
 
-	if (!mm_gc)
-		return;
-
 	gpiochip_remove(gc);
 	iounmap(mm_gc->regs);
 	kfree(gc->label);
Signature · 1 line
2.35.1
Reviewed-by on v2 1/2
#2 lore raw
In reply to Andy Shevchenko
Quoted 5 lines · Andy Shevchenko

GPIO library is getting rid of of_node, fwnode should be utilized instead. Prepare of_mm_gpiochip_add_data() for fwnode.

Quoted 21 lines

---
v2: added tag (Linus), modified according to Dmitry's suggestion

 drivers/gpio/gpiolib-of.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpio/gpiolib-of.c +2 -2
index 4be3c21aa718..d30a5210dfdd 100644
@@ -935,8 +935,8 @@ int of_mm_gpiochip_add_data(struct device_node *np,
 	if (mm_gc->save_regs)
 		mm_gc->save_regs(mm_gc);
 
-	of_node_put(mm_gc->gc.of_node);
-	mm_gc->gc.of_node = of_node_get(np);
+	fwnode_handle_put(mm_gc->gc.fwnode);
+	mm_gc->gc.fwnode = fwnode_handle_get(of_fwnode_handle(np));
 
 	ret = gpiochip_add_data(gc, data);
 	if (ret)
Quoted 4 lines

base-commit: 8dab99c9eab3162bfb4326c35579a3388dbf68f2

Signature · 1 line
2.35.1

Thanks.

Signature · 1 line
Dmitry
#3 lore raw
In reply to Andy Shevchenko
Quoted 27 lines · Andy Shevchenko

GPIO library is getting rid of of_node, fwnode should be utilized instead. Prepare of_mm_gpiochip_add_data() for fwnode.

---
v2: added tag (Linus), modified according to Dmitry's suggestion

 drivers/gpio/gpiolib-of.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpio/gpiolib-of.c +2 -2
index 4be3c21aa718..d30a5210dfdd 100644
@@ -935,8 +935,8 @@ int of_mm_gpiochip_add_data(struct device_node *np,
        if (mm_gc->save_regs)
                mm_gc->save_regs(mm_gc);
 
-       of_node_put(mm_gc->gc.of_node);
-       mm_gc->gc.of_node = of_node_get(np);
+       fwnode_handle_put(mm_gc->gc.fwnode);
+       mm_gc->gc.fwnode = fwnode_handle_get(of_fwnode_handle(np));
 
        ret = gpiochip_add_data(gc, data);
        if (ret)
Quoted 4 lines

base-commit: 8dab99c9eab3162bfb4326c35579a3388dbf68f2 --
2.35.1

Both applied, thanks!

Bart