Commit 700b6c98 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Lee Jones

leds: ktd2692: 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-2-1d0292802470@linaro.orgSigned-off-by: default avatarLee Jones <lee@kernel.org>
parent 1e63395e
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
* Ingi Kim <ingi2.kim@samsung.com> * Ingi Kim <ingi2.kim@samsung.com>
*/ */
#include <linux/cleanup.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/leds-expresswire.h> #include <linux/leds-expresswire.h>
...@@ -208,7 +209,6 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev, ...@@ -208,7 +209,6 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev,
struct ktd2692_led_config_data *cfg) struct ktd2692_led_config_data *cfg)
{ {
struct device_node *np = dev_of_node(dev); struct device_node *np = dev_of_node(dev);
struct device_node *child_node;
int ret; int ret;
if (!np) if (!np)
...@@ -239,7 +239,8 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev, ...@@ -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) { 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;
...@@ -252,26 +253,24 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev, ...@@ -252,26 +253,24 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev,
&cfg->movie_max_microamp); &cfg->movie_max_microamp);
if (ret) { if (ret) {
dev_err(dev, "failed to parse led-max-microamp\n"); 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", ret = of_property_read_u32(child_node, "flash-max-microamp",
&cfg->flash_max_microamp); &cfg->flash_max_microamp);
if (ret) { if (ret) {
dev_err(dev, "failed to parse flash-max-microamp\n"); 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", ret = of_property_read_u32(child_node, "flash-max-timeout-us",
&cfg->flash_max_timeout); &cfg->flash_max_timeout);
if (ret) { if (ret) {
dev_err(dev, "failed to parse flash-max-timeout-us\n"); dev_err(dev, "failed to parse flash-max-timeout-us\n");
goto err_parse_dt; return ret;
} }
err_parse_dt: return 0;
of_node_put(child_node);
return ret;
} }
static const struct led_flash_ops flash_ops = { static const struct led_flash_ops flash_ops = {
......
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