leds: netxbig: Simplify with scoped for each OF child loop

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

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240816-cleanup-h-of-node-put-var-v1-13-1d0292802470@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c
index 77213b79f84d95d709709e8a24e052aa0eb750c1..af5a908b8d9edd5034573a71774b471146d2cfcf 100644 (file)
--- a/drivers/leds/leds-netxbig.c
+++ b/drivers/leds/leds-netxbig.c
@@ -423,7 +423,6 @@ static int netxbig_leds_get_of_pdata(struct device *dev,
        struct device_node *gpio_ext_np;
        struct platform_device *gpio_ext_pdev;
        struct device *gpio_ext_dev;
-       struct device_node *child;
        struct netxbig_gpio_ext *gpio_ext;
        struct netxbig_led_timer *timers;
        struct netxbig_led *leds, *led;
@@ -507,7 +506,7 @@ static int netxbig_leds_get_of_pdata(struct device *dev,
        }
 
        led = leds;
-       for_each_available_child_of_node(np, child) {
+       for_each_available_child_of_node_scoped(np, child) {
                const char *string;
                int *mode_val;
                int num_modes;
@@ -515,17 +514,17 @@ static int netxbig_leds_get_of_pdata(struct device *dev,
                ret = of_property_read_u32(child, "mode-addr",
                                           &led->mode_addr);
                if (ret)
-                       goto err_node_put;
+                       goto put_device;
 
                ret = of_property_read_u32(child, "bright-addr",
                                           &led->bright_addr);
                if (ret)
-                       goto err_node_put;
+                       goto put_device;
 
                ret = of_property_read_u32(child, "max-brightness",
                                           &led->bright_max);
                if (ret)
-                       goto err_node_put;
+                       goto put_device;
 
                mode_val =
                        devm_kcalloc(dev,
@@ -533,7 +532,7 @@ static int netxbig_leds_get_of_pdata(struct device *dev,
                                     GFP_KERNEL);
                if (!mode_val) {
                        ret = -ENOMEM;
-                       goto err_node_put;
+                       goto put_device;
                }
 
                for (i = 0; i < NETXBIG_LED_MODE_NUM; i++)
@@ -542,12 +541,12 @@ static int netxbig_leds_get_of_pdata(struct device *dev,
                ret = of_property_count_u32_elems(child, "mode-val");
                if (ret < 0 || ret % 2) {
                        ret = -EINVAL;
-                       goto err_node_put;
+                       goto put_device;
                }
                num_modes = ret / 2;
                if (num_modes > NETXBIG_LED_MODE_NUM) {
                        ret = -EINVAL;
-                       goto err_node_put;
+                       goto put_device;
                }
 
                for (i = 0; i < num_modes; i++) {
@@ -560,7 +559,7 @@ static int netxbig_leds_get_of_pdata(struct device *dev,
                                                   "mode-val", 2 * i + 1, &val);
                        if (mode >= NETXBIG_LED_MODE_NUM) {
                                ret = -EINVAL;
-                               goto err_node_put;
+                               goto put_device;
                        }
                        mode_val[mode] = val;
                }
@@ -583,8 +582,6 @@ static int netxbig_leds_get_of_pdata(struct device *dev,
 
        return 0;
 
-err_node_put:
-       of_node_put(child);
 put_device:
        put_device(gpio_ext_dev);
        return ret;