leds: el15203000: Switch to device_for_each_child_node_scoped()
authorJavier Carrasco <javier.carrasco.cruz@gmail.com>
Thu, 26 Sep 2024 23:20:57 +0000 (01:20 +0200)
committerLee Jones <lee@kernel.org>
Wed, 9 Oct 2024 14:17:06 +0000 (15:17 +0100)
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 'err_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-6-95c0614b38c8@gmail.com
Signed-off-by: Lee Jones <lee@kernel.org>
drivers/leds/leds-el15203000.c

index d40194a..e26d165 100644 (file)
@@ -237,22 +237,20 @@ static int el15203000_pattern_clear(struct led_classdev *ldev)
 static int el15203000_probe_dt(struct el15203000 *priv)
 {
        struct el15203000_led   *led = priv->leds;
-       struct fwnode_handle    *child;
        int                     ret;
 
-       device_for_each_child_node(priv->dev, child) {
+       device_for_each_child_node_scoped(priv->dev, child) {
                struct led_init_data init_data = {};
 
                ret = fwnode_property_read_u32(child, "reg", &led->reg);
                if (ret) {
                        dev_err(priv->dev, "LED without ID number");
-                       goto err_child_out;
+                       return ret;
                }
 
                if (led->reg > U8_MAX) {
                        dev_err(priv->dev, "LED value %d is invalid", led->reg);
-                       ret = -EINVAL;
-                       goto err_child_out;
+                       return -EINVAL;
                }
 
                led->priv                         = priv;
@@ -274,17 +272,13 @@ static int el15203000_probe_dt(struct el15203000 *priv)
                        dev_err(priv->dev,
                                "failed to register LED device %s, err %d",
                                led->ldev.name, ret);
-                       goto err_child_out;
+                       return ret;
                }
 
                led++;
        }
 
        return 0;
-
-err_child_out:
-       fwnode_handle_put(child);
-       return ret;
 }
 
 static int el15203000_probe(struct spi_device *spi)