leds: lp50xx: Switch to device_for_each_child_node_scoped()

Switch to device_for_each_child_node_scoped() to simplify the code by
removing the need for calls to fwnode_handle_put() in the error paths.

This also prevents possible memory leaks if new error paths are added
without the required call to fwnode_handle_put().

After switching to the scoped variant, there is no longer need for a
jump to 'child_out', as an immediate return is possible.

Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Link: https://lore.kernel.org/r/20240927-leds_device_for_each_child_node_scoped-v1-10-95c0614b38c8@gmail.com
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/leds/leds-lp50xx.c b/drivers/leds/leds-lp50xx.c
index 175d4b0..32ca45a 100644 (file)
--- a/drivers/leds/leds-lp50xx.c
+++ b/drivers/leds/leds-lp50xx.c
@@ -434,7 +434,6 @@ static int lp50xx_probe_leds(struct fwnode_handle *child, struct lp50xx *priv,
 
 static int lp50xx_probe_dt(struct lp50xx *priv)
 {
-       struct fwnode_handle *child = NULL;
        struct fwnode_handle *led_node = NULL;
        struct led_init_data init_data = {};
        struct led_classdev *led_cdev;
@@ -454,17 +453,17 @@ static int lp50xx_probe_dt(struct lp50xx *priv)
        if (IS_ERR(priv->regulator))
                priv->regulator = NULL;
 
-       device_for_each_child_node(priv->dev, child) {
+       device_for_each_child_node_scoped(priv->dev, child) {
                led = &priv->leds[i];
                ret = fwnode_property_count_u32(child, "reg");
                if (ret < 0) {
                        dev_err(priv->dev, "reg property is invalid\n");
-                       goto child_out;
+                       return ret;
                }
 
                ret = lp50xx_probe_leds(child, priv, led, ret);
                if (ret)
-                       goto child_out;
+                       return ret;
 
                init_data.fwnode = child;
                num_colors = 0;
@@ -475,10 +474,8 @@ static int lp50xx_probe_dt(struct lp50xx *priv)
                 */
                mc_led_info = devm_kcalloc(priv->dev, LP50XX_LEDS_PER_MODULE,
                                           sizeof(*mc_led_info), GFP_KERNEL);
-               if (!mc_led_info) {
-                       ret = -ENOMEM;
-                       goto child_out;
-               }
+               if (!mc_led_info)
+                       return -ENOMEM;
 
                fwnode_for_each_child_node(child, led_node) {
                        ret = fwnode_property_read_u32(led_node, "color",
@@ -486,7 +483,7 @@ static int lp50xx_probe_dt(struct lp50xx *priv)
                        if (ret) {
                                fwnode_handle_put(led_node);
                                dev_err(priv->dev, "Cannot read color\n");
-                               goto child_out;
+                               return ret;
                        }
 
                        mc_led_info[num_colors].color_index = color_id;
@@ -504,16 +501,12 @@ static int lp50xx_probe_dt(struct lp50xx *priv)
                                                       &init_data);
                if (ret) {
                        dev_err(priv->dev, "led register err: %d\n", ret);
-                       goto child_out;
+                       return ret;
                }
                i++;
        }
 
        return 0;
-
-child_out:
-       fwnode_handle_put(child);
-       return ret;
 }
 
 static int lp50xx_probe(struct i2c_client *client)