Commit af7460d5 authored by Jinjie Ruan's avatar Jinjie Ruan Committed by Rob Herring (Arm)

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

Use scoped for_each_child_of_node_scoped() when iterating over device
nodes to make code a bit simpler.
Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
Link: https://lore.kernel.org/r/20240826062408.2406734-2-ruanjinjie@huawei.comSigned-off-by: default avatarRob Herring (Arm) <robh@kernel.org>
parent 39ab331a
...@@ -472,7 +472,6 @@ static int add_changeset_node(struct overlay_changeset *ovcs, ...@@ -472,7 +472,6 @@ static int add_changeset_node(struct overlay_changeset *ovcs,
static int build_changeset_next_level(struct overlay_changeset *ovcs, static int build_changeset_next_level(struct overlay_changeset *ovcs,
struct target *target, const struct device_node *overlay_node) struct target *target, const struct device_node *overlay_node)
{ {
struct device_node *child;
struct property *prop; struct property *prop;
int ret; int ret;
...@@ -485,12 +484,11 @@ static int build_changeset_next_level(struct overlay_changeset *ovcs, ...@@ -485,12 +484,11 @@ static int build_changeset_next_level(struct overlay_changeset *ovcs,
} }
} }
for_each_child_of_node(overlay_node, child) { for_each_child_of_node_scoped(overlay_node, child) {
ret = add_changeset_node(ovcs, target, child); ret = add_changeset_node(ovcs, target, child);
if (ret) { if (ret) {
pr_debug("Failed to apply node @%pOF/%pOFn, err=%d\n", pr_debug("Failed to apply node @%pOF/%pOFn, err=%d\n",
target->np, child, ret); target->np, child, ret);
of_node_put(child);
return ret; return ret;
} }
} }
...@@ -1078,17 +1076,13 @@ EXPORT_SYMBOL_GPL(of_overlay_fdt_apply); ...@@ -1078,17 +1076,13 @@ EXPORT_SYMBOL_GPL(of_overlay_fdt_apply);
*/ */
static int find_node(struct device_node *tree, struct device_node *np) static int find_node(struct device_node *tree, struct device_node *np)
{ {
struct device_node *child;
if (tree == np) if (tree == np)
return 1; return 1;
for_each_child_of_node(tree, child) { for_each_child_of_node_scoped(tree, child) {
if (find_node(child, np)) { if (find_node(child, np))
of_node_put(child);
return 1; return 1;
} }
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment