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: Jinjie Ruan <ruanjinjie@huawei.com>
Link: https://lore.kernel.org/r/20240826062408.2406734-2-ruanjinjie@huawei.com
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>

diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 4d861a75d6946247a9c397fbcaac4cfa0d71af4f..cbdecccca097452724bead3fdba809a38d2da58d 100644 (file)
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -472,7 +472,6 @@ static int add_changeset_node(struct overlay_changeset *ovcs,
 static int build_changeset_next_level(struct overlay_changeset *ovcs,
                struct target *target, const struct device_node *overlay_node)
 {
-       struct device_node *child;
        struct property *prop;
        int ret;
 
@@ -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);
                if (ret) {
                        pr_debug("Failed to apply node @%pOF/%pOFn, err=%d\n",
                                 target->np, child, ret);
-                       of_node_put(child);
                        return ret;
                }
        }
@@ -1078,16 +1076,12 @@ EXPORT_SYMBOL_GPL(of_overlay_fdt_apply);
  */
 static int find_node(struct device_node *tree, struct device_node *np)
 {
-       struct device_node *child;
-
        if (tree == np)
                return 1;
 
-       for_each_child_of_node(tree, child) {
-               if (find_node(child, np)) {
-                       of_node_put(child);
+       for_each_child_of_node_scoped(tree, child) {
+               if (find_node(child, np))
                        return 1;
-               }
        }
 
        return 0;