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

index 16b169e658debe722adb7ad3494a9b4f7104d653..90d78b3d22f8825e687a316512da15eb689639e6 100644 (file)
@@ -599,7 +599,7 @@ static int max77693_led_parse_dt(struct max77693_led_device *led,
 {
        struct device *dev = &led->pdev->dev;
        struct max77693_sub_led *sub_leds = led->sub_leds;
-       struct device_node *node = dev_of_node(dev), *child_node;
+       struct device_node *node = dev_of_node(dev);
        struct property *prop;
        u32 led_sources[2];
        int i, ret, fled_id;
@@ -608,7 +608,7 @@ static int max77693_led_parse_dt(struct max77693_led_device *led,
        of_property_read_u32(node, "maxim,boost-mvout", &cfg->boost_vout);
        of_property_read_u32(node, "maxim,mvsys-min", &cfg->low_vsys);
 
-       for_each_available_child_of_node(node, child_node) {
+       for_each_available_child_of_node_scoped(node, child_node) {
                prop = of_find_property(child_node, "led-sources", NULL);
                if (prop) {
                        const __be32 *srcs = NULL;
@@ -622,7 +622,6 @@ static int max77693_led_parse_dt(struct max77693_led_device *led,
                } else {
                        dev_err(dev,
                                "led-sources DT property missing\n");
-                       of_node_put(child_node);
                        return -EINVAL;
                }
 
@@ -638,14 +637,12 @@ static int max77693_led_parse_dt(struct max77693_led_device *led,
                } else {
                        dev_err(dev,
                                "Wrong led-sources DT property value.\n");
-                       of_node_put(child_node);
                        return -EINVAL;
                }
 
                if (sub_nodes[fled_id]) {
                        dev_err(dev,
                                "Conflicting \"led-sources\" DT properties\n");
-                       of_node_put(child_node);
                        return -EINVAL;
                }
 
@@ -681,10 +678,8 @@ static int max77693_led_parse_dt(struct max77693_led_device *led,
 
                if (++cfg->num_leds == 2 ||
                    (max77693_fled_used(led, FLED1) &&
-                    max77693_fled_used(led, FLED2))) {
-                       of_node_put(child_node);
+                    max77693_fled_used(led, FLED2)))
                        break;
-               }
        }
 
        if (cfg->num_leds == 0) {