]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
leds: mt6323: Simplify with scoped for each OF child loop
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Fri, 16 Aug 2024 15:31:44 +0000 (17:31 +0200)
committerLee Jones <lee@kernel.org>
Thu, 22 Aug 2024 13:23:08 +0000 (14:23 +0100)
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-12-1d0292802470@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
drivers/leds/leds-mt6323.c

index 40d508510823298580c93b32336998982c39fc1f..a19e8e0b6d1b1de86a2606a9e6942bc06769c675 100644 (file)
@@ -527,7 +527,6 @@ static int mt6323_led_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct device_node *np = dev_of_node(dev);
-       struct device_node *child;
        struct mt6397_chip *hw = dev_get_drvdata(dev->parent);
        struct mt6323_leds *leds;
        struct mt6323_led *led;
@@ -565,28 +564,25 @@ static int mt6323_led_probe(struct platform_device *pdev)
                return ret;
        }
 
-       for_each_available_child_of_node(np, child) {
+       for_each_available_child_of_node_scoped(np, child) {
                struct led_init_data init_data = {};
                bool is_wled;
 
                ret = of_property_read_u32(child, "reg", &reg);
                if (ret) {
                        dev_err(dev, "Failed to read led 'reg' property\n");
-                       goto put_child_node;
+                       return ret;
                }
 
                if (reg >= max_leds || reg >= MAX_SUPPORTED_LEDS ||
                    leds->led[reg]) {
                        dev_err(dev, "Invalid led reg %u\n", reg);
-                       ret = -EINVAL;
-                       goto put_child_node;
+                       return -EINVAL;
                }
 
                led = devm_kzalloc(dev, sizeof(*led), GFP_KERNEL);
-               if (!led) {
-                       ret = -ENOMEM;
-                       goto put_child_node;
-               }
+               if (!led)
+                       return -ENOMEM;
 
                is_wled = of_property_read_bool(child, "mediatek,is-wled");
 
@@ -612,7 +608,7 @@ static int mt6323_led_probe(struct platform_device *pdev)
                if (ret < 0) {
                        dev_err(leds->dev,
                                "Failed to LED set default from devicetree\n");
-                       goto put_child_node;
+                       return ret;
                }
 
                init_data.fwnode = of_fwnode_handle(child);
@@ -621,15 +617,11 @@ static int mt6323_led_probe(struct platform_device *pdev)
                                                     &init_data);
                if (ret) {
                        dev_err(dev, "Failed to register LED: %d\n", ret);
-                       goto put_child_node;
+                       return ret;
                }
        }
 
        return 0;
-
-put_child_node:
-       of_node_put(child);
-       return ret;
 }
 
 static void mt6323_led_remove(struct platform_device *pdev)