Skip to contentSkip to conversation

gpio: Use of_property_present()

PATCH Applied Rob Herring (Arm) 2 participants 2 messages Jul 31, 2024 – Aug 1, 2024 GPIO

lore
Share & tools
lore

Rob Herring (Arm)

author
#0 lore raw

PATCH 1/1 gpio: Use of_property_present()

Use of_property_present() to test for property presence rather than of_find_property(). This is part of a larger effort to remove callers of of_find_property() and similar functions. of_find_property() leaks the DT struct property and data pointers which is a problem for dynamically allocated nodes which may be freed.

Signed-off-by Rob Herring (Arm) <[email protected]>
---
 drivers/gpio/gpiolib-of.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpio/gpiolib-of.c +4 -4
index f6af5e7be4d1..6683e531df52 100644
@@ -1058,13 +1058,13 @@ static int of_gpiochip_add_pin_range(struct gpio_chip *chip)
 	int index = 0, ret, trim;
 	const char *name;
 	static const char group_names_propname[] = "gpio-ranges-group-names";
-	struct property *group_names;
+	bool has_group_names;
 
 	np = dev_of_node(&chip->gpiodev->dev);
 	if (!np)
 		return 0;
 
-	group_names = of_find_property(np, group_names_propname, NULL);
+	has_group_names = of_property_present(np, group_names_propname);
 
 	for (;; index++) {
 		ret = of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3,

@@ -1085,7 +1085,7 @@ static int of_gpiochip_add_pin_range(struct gpio_chip *chip)
 
 		if (pinspec.args[2]) {
 			/* npins != 0: linear range */
-			if (group_names) {
+			if (has_group_names) {
 				of_property_read_string_index(np,
 						group_names_propname,
 						index, &name);

@@ -1123,7 +1123,7 @@ static int of_gpiochip_add_pin_range(struct gpio_chip *chip)
 				break;
 			}
 
-			if (!group_names) {
+			if (!has_group_names) {
 				pr_err("%pOF: GPIO group range requested but no %s property.\n",
 					np, group_names_propname);
 				break;
Signature · 1 line
2.43.0
Applied
#1 lore raw

From: Bartosz Golaszewski <[email protected]>

Quoted 8 lines · Rob Herring (Arm)

Use of_property_present() to test for property presence rather than of_find_property(). This is part of a larger effort to remove callers of of_find_property() and similar functions. of_find_property() leaks the DT struct property and data pointers which is a problem for dynamically allocated nodes which may be freed.

[...]

Applied, thanks!

[1/1] gpio: Use of_property_present()

      commit: b034a90b2745e43b4a85b56dc5fd7a6fa1a21f31

Best regards,

Signature · 1 line
Bartosz Golaszewski <[email protected]>