leds: lm3532: 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-8-95c0614b38c8@gmail.com
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/leds/leds-lm3532.c b/drivers/leds/leds-lm3532.c
index 54b5650877f700d3d400709aff94e9bc4ff8a821..24dc8ad27bb3c01525c450fdeffeca6de80b972e 100644 (file)
--- a/drivers/leds/leds-lm3532.c
+++ b/drivers/leds/leds-lm3532.c
@@ -551,7 +551,6 @@ static void gpio_set_low_action(void *data)
 
 static int lm3532_parse_node(struct lm3532_data *priv)
 {
-       struct fwnode_handle *child = NULL;
        struct lm3532_led *led;
        int control_bank;
        u32 ramp_time;
@@ -587,7 +586,7 @@ static int lm3532_parse_node(struct lm3532_data *priv)
        else
                priv->runtime_ramp_down = lm3532_get_ramp_index(ramp_time);
 
-       device_for_each_child_node(priv->dev, child) {
+       device_for_each_child_node_scoped(priv->dev, child) {
                struct led_init_data idata = {
                        .fwnode = child,
                        .default_label = ":",
@@ -599,7 +598,7 @@ static int lm3532_parse_node(struct lm3532_data *priv)
                ret = fwnode_property_read_u32(child, "reg", &control_bank);
                if (ret) {
                        dev_err(&priv->client->dev, "reg property missing\n");
-                       goto child_out;
+                       return ret;
                }
 
                if (control_bank > LM3532_CONTROL_C) {
@@ -613,7 +612,7 @@ static int lm3532_parse_node(struct lm3532_data *priv)
                                               &led->mode);
                if (ret) {
                        dev_err(&priv->client->dev, "ti,led-mode property missing\n");
-                       goto child_out;
+                       return ret;
                }
 
                if (fwnode_property_present(child, "led-max-microamp") &&
@@ -647,7 +646,7 @@ static int lm3532_parse_node(struct lm3532_data *priv)
                                                    led->num_leds);
                if (ret) {
                        dev_err(&priv->client->dev, "led-sources property missing\n");
-                       goto child_out;
+                       return ret;
                }
 
                led->priv = priv;
@@ -657,23 +656,20 @@ static int lm3532_parse_node(struct lm3532_data *priv)
                if (ret) {
                        dev_err(&priv->client->dev, "led register err: %d\n",
                                ret);
-                       goto child_out;
+                       return ret;
                }
 
                ret = lm3532_init_registers(led);
                if (ret) {
                        dev_err(&priv->client->dev, "register init err: %d\n",
                                ret);
-                       goto child_out;
+                       return ret;
                }
 
                i++;
        }
-       return 0;
 
-child_out:
-       fwnode_handle_put(child);
-       return ret;
+       return 0;
 }
 
 static int lm3532_probe(struct i2c_client *client)