gpu: host1x: Use for_each_available_child_of_node_scoped()

Avoids the need for manual cleanup of_node_put() in early exits
from the loop.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20240830073824.3539690-1-ruanjinjie@huawei.com

diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c
index 8e09d6d328d22d275de61280709c55ed694f7f36..344cc9e741c1357420240467754fd151926b3bd5 100644 (file)
--- a/drivers/gpu/host1x/bus.c
+++ b/drivers/gpu/host1x/bus.c
@@ -41,7 +41,6 @@ static int host1x_subdev_add(struct host1x_device *device,
                             struct device_node *np)
 {
        struct host1x_subdev *subdev;
-       struct device_node *child;
        int err;
 
        subdev = kzalloc(sizeof(*subdev), GFP_KERNEL);
@@ -56,13 +55,12 @@ static int host1x_subdev_add(struct host1x_device *device,
        mutex_unlock(&device->subdevs_lock);
 
        /* recursively add children */
-       for_each_child_of_node(np, child) {
+       for_each_child_of_node_scoped(np, child) {
                if (of_match_node(driver->subdevs, child) &&
                    of_device_is_available(child)) {
                        err = host1x_subdev_add(device, driver, child);
                        if (err < 0) {
                                /* XXX cleanup? */
-                               of_node_put(child);
                                return err;
                        }
                }
@@ -90,17 +88,14 @@ static void host1x_subdev_del(struct host1x_subdev *subdev)
 static int host1x_device_parse_dt(struct host1x_device *device,
                                  struct host1x_driver *driver)
 {
-       struct device_node *np;
        int err;
 
-       for_each_child_of_node(device->dev.parent->of_node, np) {
+       for_each_child_of_node_scoped(device->dev.parent->of_node, np) {
                if (of_match_node(driver->subdevs, np) &&
                    of_device_is_available(np)) {
                        err = host1x_subdev_add(device, driver, np);
-                       if (err < 0) {
-                               of_node_put(np);
+                       if (err < 0)
                                return err;
-                       }
                }
        }