]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
leds: ktd2692: Use scoped device node handling to simplify error paths
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Fri, 16 Aug 2024 15:31:34 +0000 (17:31 +0200)
committerLee Jones <lee@kernel.org>
Thu, 22 Aug 2024 13:22:44 +0000 (14:22 +0100)
Obtain the device node reference with scoped/cleanup.h to reduce error
handling and make the 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-2-1d0292802470@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
drivers/leds/flash/leds-ktd2692.c

index 7bb0aa2753e365ef386835767bfe357690631ff3..16a01a200c0b751815da0238d14f8dd75ffd387b 100644 (file)
@@ -6,6 +6,7 @@
  * Ingi Kim <ingi2.kim@samsung.com>
  */
 
+#include <linux/cleanup.h>
 #include <linux/err.h>
 #include <linux/gpio/consumer.h>
 #include <linux/leds-expresswire.h>
@@ -208,7 +209,6 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev,
                            struct ktd2692_led_config_data *cfg)
 {
        struct device_node *np = dev_of_node(dev);
-       struct device_node *child_node;
        int ret;
 
        if (!np)
@@ -239,7 +239,8 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev,
                }
        }
 
-       child_node = of_get_next_available_child(np, NULL);
+       struct device_node *child_node __free(device_node) =
+               of_get_next_available_child(np, NULL);
        if (!child_node) {
                dev_err(dev, "No DT child node found for connected LED.\n");
                return -EINVAL;
@@ -252,26 +253,24 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev,
                                   &cfg->movie_max_microamp);
        if (ret) {
                dev_err(dev, "failed to parse led-max-microamp\n");
-               goto err_parse_dt;
+               return ret;
        }
 
        ret = of_property_read_u32(child_node, "flash-max-microamp",
                                   &cfg->flash_max_microamp);
        if (ret) {
                dev_err(dev, "failed to parse flash-max-microamp\n");
-               goto err_parse_dt;
+               return ret;
        }
 
        ret = of_property_read_u32(child_node, "flash-max-timeout-us",
                                   &cfg->flash_max_timeout);
        if (ret) {
                dev_err(dev, "failed to parse flash-max-timeout-us\n");
-               goto err_parse_dt;
+               return ret;
        }
 
-err_parse_dt:
-       of_node_put(child_node);
-       return ret;
+       return 0;
 }
 
 static const struct led_flash_ops flash_ops = {