Commit 1e63395e authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Lee Jones

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240816-cleanup-h-of-node-put-var-v1-1-1d0292802470@linaro.orgSigned-off-by: default avatarLee Jones <lee@kernel.org>
parent 8f3f0751
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* Author: Jacek Anaszewski <j.anaszewski@samsung.com> * Author: Jacek Anaszewski <j.anaszewski@samsung.com>
*/ */
#include <linux/cleanup.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/led-class-flash.h> #include <linux/led-class-flash.h>
...@@ -215,7 +216,6 @@ static int aat1290_led_parse_dt(struct aat1290_led *led, ...@@ -215,7 +216,6 @@ static int aat1290_led_parse_dt(struct aat1290_led *led,
struct device_node **sub_node) struct device_node **sub_node)
{ {
struct device *dev = &led->pdev->dev; struct device *dev = &led->pdev->dev;
struct device_node *child_node;
#if IS_ENABLED(CONFIG_V4L2_FLASH_LED_CLASS) #if IS_ENABLED(CONFIG_V4L2_FLASH_LED_CLASS)
struct pinctrl *pinctrl; struct pinctrl *pinctrl;
#endif #endif
...@@ -246,7 +246,8 @@ static int aat1290_led_parse_dt(struct aat1290_led *led, ...@@ -246,7 +246,8 @@ static int aat1290_led_parse_dt(struct aat1290_led *led,
} }
#endif #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) { if (!child_node) {
dev_err(dev, "No DT child node found for connected LED.\n"); dev_err(dev, "No DT child node found for connected LED.\n");
return -EINVAL; return -EINVAL;
...@@ -267,7 +268,7 @@ static int aat1290_led_parse_dt(struct aat1290_led *led, ...@@ -267,7 +268,7 @@ static int aat1290_led_parse_dt(struct aat1290_led *led,
if (ret < 0) { if (ret < 0) {
dev_err(dev, dev_err(dev,
"flash-max-microamp DT property missing\n"); "flash-max-microamp DT property missing\n");
goto err_parse_dt; return ret;
} }
ret = of_property_read_u32(child_node, "flash-max-timeout-us", 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, ...@@ -275,15 +276,12 @@ static int aat1290_led_parse_dt(struct aat1290_led *led,
if (ret < 0) { if (ret < 0) {
dev_err(dev, dev_err(dev,
"flash-max-timeout-us DT property missing\n"); "flash-max-timeout-us DT property missing\n");
goto err_parse_dt; return ret;
} }
*sub_node = child_node; *sub_node = child_node;
err_parse_dt: return 0;
of_node_put(child_node);
return ret;
} }
static void aat1290_led_validate_mm_current(struct aat1290_led *led, static void aat1290_led_validate_mm_current(struct aat1290_led *led,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment