leds: aat1290: Use scoped device node handling to simplify error paths

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-1-1d0292802470@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/leds/flash/leds-aat1290.c b/drivers/leds/flash/leds-aat1290.c
index e8f9dd29359262d9230d9772cf1e611a5b6b237f..c7b6a1f0128828c7b5da2fc257c8f7706bdcf903 100644 (file)
--- a/drivers/leds/flash/leds-aat1290.c
+++ b/drivers/leds/flash/leds-aat1290.c
@@ -7,6 +7,7 @@
  *     Author: Jacek Anaszewski <j.anaszewski@samsung.com>
  */
 
+#include <linux/cleanup.h>
 #include <linux/delay.h>
 #include <linux/gpio/consumer.h>
 #include <linux/led-class-flash.h>
@@ -215,7 +216,6 @@ static int aat1290_led_parse_dt(struct aat1290_led *led,
                        struct device_node **sub_node)
 {
        struct device *dev = &led->pdev->dev;
-       struct device_node *child_node;
 #if IS_ENABLED(CONFIG_V4L2_FLASH_LED_CLASS)
        struct pinctrl *pinctrl;
 #endif
@@ -246,7 +246,8 @@ static int aat1290_led_parse_dt(struct aat1290_led *led,
        }
 #endif
 
-       child_node = of_get_next_available_child(dev_of_node(dev), NULL);
+       struct device_node *child_node __free(device_node) =
+               of_get_next_available_child(dev_of_node(dev), NULL);
        if (!child_node) {
                dev_err(dev, "No DT child node found for connected LED.\n");
                return -EINVAL;
@@ -267,7 +268,7 @@ static int aat1290_led_parse_dt(struct aat1290_led *led,
        if (ret < 0) {
                dev_err(dev,
                        "flash-max-microamp DT property missing\n");
-               goto err_parse_dt;
+               return ret;
        }
 
        ret = of_property_read_u32(child_node, "flash-max-timeout-us",
@@ -275,15 +276,12 @@ static int aat1290_led_parse_dt(struct aat1290_led *led,
        if (ret < 0) {
                dev_err(dev,
                        "flash-max-timeout-us DT property missing\n");
-               goto err_parse_dt;
+               return ret;
        }
 
        *sub_node = child_node;
 
-err_parse_dt:
-       of_node_put(child_node);
-
-       return ret;
+       return 0;
 }
 
 static void aat1290_led_validate_mm_current(struct aat1290_led *led,