leds: rgb: mt6370: 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 'fwnode_release', as an immediate return is possible. Given that
the loop is called in the probe function, and it already uses
dev_err_probe(), the common "dev_err() + return" has been updated as
well.

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

diff --git a/drivers/leds/rgb/leds-mt6370-rgb.c b/drivers/leds/rgb/leds-mt6370-rgb.c
index 359ef00498b43a637b402354884db53285f68de8..fe76e8e27f9c9c79f8f40490c892c1a8659a1288 100644 (file)
--- a/drivers/leds/rgb/leds-mt6370-rgb.c
+++ b/drivers/leds/rgb/leds-mt6370-rgb.c
@@ -905,7 +905,6 @@ static int mt6370_leds_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct mt6370_priv *priv;
-       struct fwnode_handle *child;
        size_t count;
        unsigned int i = 0;
        int ret;
@@ -936,37 +935,27 @@ static int mt6370_leds_probe(struct platform_device *pdev)
        if (ret)
                return dev_err_probe(dev, ret, "Failed to allocate regmap field\n");
 
-       device_for_each_child_node(dev, child) {
+       device_for_each_child_node_scoped(dev, child) {
                struct mt6370_led *led = priv->leds + i++;
                struct led_init_data init_data = { .fwnode = child };
                u32 reg, color;
 
                ret = fwnode_property_read_u32(child, "reg", &reg);
-               if (ret) {
-                       dev_err(dev, "Failed to parse reg property\n");
-                       goto fwnode_release;
-               }
+               if (ret)
+                       dev_err_probe(dev, ret, "Failed to parse reg property\n");
 
-               if (reg >= MT6370_MAX_LEDS) {
-                       ret = -EINVAL;
-                       dev_err(dev, "Error reg property number\n");
-                       goto fwnode_release;
-               }
+               if (reg >= MT6370_MAX_LEDS)
+                       return dev_err_probe(dev, -EINVAL, "Error reg property number\n");
 
                ret = fwnode_property_read_u32(child, "color", &color);
-               if (ret) {
-                       dev_err(dev, "Failed to parse color property\n");
-                       goto fwnode_release;
-               }
+               if (ret)
+                       return dev_err_probe(dev, ret, "Failed to parse color property\n");
 
                if (color == LED_COLOR_ID_RGB || color == LED_COLOR_ID_MULTI)
                        reg = MT6370_VIRTUAL_MULTICOLOR;
 
-               if (priv->leds_active & BIT(reg)) {
-                       ret = -EINVAL;
-                       dev_err(dev, "Duplicate reg property\n");
-                       goto fwnode_release;
-               }
+               if (priv->leds_active & BIT(reg))
+                       return dev_err_probe(dev, -EINVAL, "Duplicate reg property\n");
 
                priv->leds_active |= BIT(reg);
 
@@ -975,18 +964,14 @@ static int mt6370_leds_probe(struct platform_device *pdev)
 
                ret = mt6370_init_led_properties(dev, led, &init_data);
                if (ret)
-                       goto fwnode_release;
+                       return ret;
 
                ret = mt6370_led_register(dev, led, &init_data);
                if (ret)
-                       goto fwnode_release;
+                       return ret;
        }
 
        return 0;
-
-fwnode_release:
-       fwnode_handle_put(child);
-       return ret;
 }
 
 static const struct of_device_id mt6370_rgbled_device_table[] = {