Skip to contentSkip to conversation

of: property: Use scope based cleanup on port_node

PATCH Applied Shresth Prasad 2 participants 2 messages Apr 28, 2024 – Apr 29, 2024 Device tree

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 of: property: Use scope based cleanup on port_node

Use __free cleanup handler which ensures that the resource is freed when it goes out of scope, thus removing the need to manually clean it up using of_node_put.

---
Rob Herring <[email protected]> sent a patch fixing similar cases in property.c but seems to have missed this one. Please let me know if this is mistake, or if it was left unchanged for a reason.

 drivers/of/property.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/of/property.c +2 -3
index 6d5ae58a7ac9..abc8613b471f 100644
@@ -576,7 +576,8 @@ EXPORT_SYMBOL_GPL(of_prop_next_string);
 int of_graph_parse_endpoint(const struct device_node *node,
 			    struct of_endpoint *endpoint)
 {
-	struct device_node *port_node = of_get_parent(node);
+	struct device_node *port_node __free(device_node) =
+			    of_get_parent(node);
 
 	WARN_ONCE(!port_node, "%s(): endpoint %pOF has no parent node\n",
 		  __func__, node);
@@ -591,8 +592,6 @@ int of_graph_parse_endpoint(const struct device_node *node,
 	of_property_read_u32(port_node, "reg", &endpoint->port);
 	of_property_read_u32(node, "reg", &endpoint->id);
 
-	of_node_put(port_node);
-
 	return 0;
 }
 EXPORT_SYMBOL(of_graph_parse_endpoint);
Signature · 1 line
2.44.0
maintainer Applied
#1 lore raw
Quoted 6 lines · Shresth Prasad

Use __free cleanup handler which ensures that the resource is freed when it goes out of scope, thus removing the need to manually clean it up using of_node_put.

Quoted 8 lines

---
Rob Herring <[email protected]> sent a patch fixing similar cases in property.c but seems to have missed this one. Please let me know if this is mistake, or if it was left unchanged for a reason.

 drivers/of/property.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Applied, thanks!