of: unittest: Use for_each_child_of_node_scoped()

A simple example of the utility of this autocleanup approach to
handling of_node_put().

In this particular case some of the nodes needed for the test are
not available and the _available_ version would cause them to be
skipped resulting in a test failure.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20240225142714.286440-4-jic23@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 4c67de37bf2636c09583e0aac32bea93dc27fb96..0913d916e790501a40b4f1dae5fbad7fd1582aba 100644 (file)
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -233,27 +233,22 @@ static void __init of_unittest_dynamic(void)
 
 static int __init of_unittest_check_node_linkage(struct device_node *np)
 {
-       struct device_node *child;
        int count = 0, rc;
 
-       for_each_child_of_node(np, child) {
+       for_each_child_of_node_scoped(np, child) {
                if (child->parent != np) {
                        pr_err("Child node %pOFn links to wrong parent %pOFn\n",
                                 child, np);
-                       rc = -EINVAL;
-                       goto put_child;
+                       return -EINVAL;
                }
 
                rc = of_unittest_check_node_linkage(child);
                if (rc < 0)
-                       goto put_child;
+                       return rc;
                count += rc;
        }
 
        return count + 1;
-put_child:
-       of_node_put(child);
-       return rc;
 }
 
 static void __init of_unittest_check_tree_linkage(void)