kevin/linux
1
Fork 0
Code

of: resolver: Simplify with scoped for each OF child loop

Browse Source 
Use scoped for_each_child_of_node_scoped() when iterating over device
nodes to make code a bit simpler.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Link: https://lore.kernel.org/r/20240826062408.2406734-4-ruanjinjie@huawei.com
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
This commit is contained in:
Jinjie Ruan 2024-08-26 14:24:08 +08:00 committed by Rob Herring (Arm)
parent bd7b58681a
commit 97c5aac4f2
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/of/resolver.c
View File

@ -150,7 +150,7 @@ static int node_name_cmp(const struct device_node *dn1,
static int adjust_local_phandle_references(struct device_node *local_fixups, static int adjust_local_phandle_references(struct device_node *local_fixups,
struct device_node *overlay, int phandle_delta) struct device_node *overlay, int phandle_delta)
{ {
struct device_node *child, *overlay_child; struct device_node *overlay_child;
struct property *prop_fix, *prop; struct property *prop_fix, *prop;
int err, i, count; int err, i, count;
unsigned int off; unsigned int off;
@ -194,7 +194,7 @@ static int adjust_local_phandle_references(struct device_node *local_fixups,
* The roots of the subtrees are the overlay's __local_fixups__ node * The roots of the subtrees are the overlay's __local_fixups__ node
* and the overlay's root node. * and the overlay's root node.
*/ */
for_each_child_of_node(local_fixups, child) { for_each_child_of_node_scoped(local_fixups, child) {
for_each_child_of_node(overlay, overlay_child) for_each_child_of_node(overlay, overlay_child)
if (!node_name_cmp(child, overlay_child)) { if (!node_name_cmp(child, overlay_child)) {
@ -202,18 +202,14 @@ static int adjust_local_phandle_references(struct device_node *local_fixups,
break; break;
} }
if (!overlay_child) { if (!overlay_child)
of_node_put(child);
return -EINVAL; return -EINVAL;
}
err = adjust_local_phandle_references(child, overlay_child, err = adjust_local_phandle_references(child, overlay_child,
phandle_delta); phandle_delta);
if (err) { if (err)
of_node_put(child);
return err; return err;
} }
}
return 0; return 0;
} }