Skip to content

Commit 700b6c9

Browse files
krzklag-linaro
authored andcommitted
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: Krzysztof Kozlowski <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lee Jones <[email protected]>
1 parent 1e63395 commit 700b6c9

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

drivers/leds/flash/leds-ktd2692.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* Ingi Kim <[email protected]>
77
*/
88

9+
#include <linux/cleanup.h>
910
#include <linux/err.h>
1011
#include <linux/gpio/consumer.h>
1112
#include <linux/leds-expresswire.h>
@@ -208,7 +209,6 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev,
208209
struct ktd2692_led_config_data *cfg)
209210
{
210211
struct device_node *np = dev_of_node(dev);
211-
struct device_node *child_node;
212212
int ret;
213213

214214
if (!np)
@@ -239,7 +239,8 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev,
239239
}
240240
}
241241

242-
child_node = of_get_next_available_child(np, NULL);
242+
struct device_node *child_node __free(device_node) =
243+
of_get_next_available_child(np, NULL);
243244
if (!child_node) {
244245
dev_err(dev, "No DT child node found for connected LED.\n");
245246
return -EINVAL;
@@ -252,26 +253,24 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev,
252253
&cfg->movie_max_microamp);
253254
if (ret) {
254255
dev_err(dev, "failed to parse led-max-microamp\n");
255-
goto err_parse_dt;
256+
return ret;
256257
}
257258

258259
ret = of_property_read_u32(child_node, "flash-max-microamp",
259260
&cfg->flash_max_microamp);
260261
if (ret) {
261262
dev_err(dev, "failed to parse flash-max-microamp\n");
262-
goto err_parse_dt;
263+
return ret;
263264
}
264265

265266
ret = of_property_read_u32(child_node, "flash-max-timeout-us",
266267
&cfg->flash_max_timeout);
267268
if (ret) {
268269
dev_err(dev, "failed to parse flash-max-timeout-us\n");
269-
goto err_parse_dt;
270+
return ret;
270271
}
271272

272-
err_parse_dt:
273-
of_node_put(child_node);
274-
return ret;
273+
return 0;
275274
}
276275

277276
static const struct led_flash_ops flash_ops = {

0 commit comments

Comments
 (0)