kevin/linux
1
Fork 0
Code

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

Browse Source 
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-11-1d0292802470@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
Krzysztof Kozlowski 2024-08-16 17:31:43 +02:00 committed by Lee Jones
parent 9d4cfee092
commit e98a7f1fb9
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/leds/leds-mc13783.c
View File

@ -12,6 +12,7 @@
* Eric Miao <eric.miao@marvell.com>
*/
#include <linux/cleanup.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
@ -113,7 +114,7 @@ static struct mc13xxx_leds_platform_data __init *mc13xxx_led_probe_dt(
{
struct mc13xxx_leds *leds = platform_get_drvdata(pdev);
struct mc13xxx_leds_platform_data *pdata;
struct device_node *parent, *child;
struct device_node *child;
struct device *dev = &pdev->dev;
int i = 0, ret = -ENODATA;
@ -121,24 +122,23 @@ static struct mc13xxx_leds_platform_data __init *mc13xxx_led_probe_dt(
if (!pdata)
return ERR_PTR(-ENOMEM);
parent = of_get_child_by_name(dev_of_node(dev->parent), "leds");
struct device_node *parent __free(device_node) =
of_get_child_by_name(dev_of_node(dev->parent), "leds");
if (!parent)
goto out_node_put;
return ERR_PTR(-ENODATA);
ret = of_property_read_u32_array(parent, "led-control",
pdata->led_control,
leds->devtype->num_regs);
if (ret)
goto out_node_put;
return ERR_PTR(ret);
pdata->num_leds = of_get_available_child_count(parent);
pdata->led = devm_kcalloc(dev, pdata->num_leds, sizeof(*pdata->led),
GFP_KERNEL);
if (!pdata->led) {
ret = -ENOMEM;
goto out_node_put;
}
if (!pdata->led)
return ERR_PTR(-ENOMEM);
for_each_available_child_of_node(parent, child) {
const char *str;
@ -158,12 +158,10 @@ static struct mc13xxx_leds_platform_data __init *mc13xxx_led_probe_dt(
}
pdata->num_leds = i;
ret = i > 0 ? 0 : -ENODATA;
if (i <= 0)
return ERR_PTR(-ENODATA);
out_node_put:
of_node_put(parent);
return ret ? ERR_PTR(ret) : pdata;
return pdata;
}
#else
static inline struct mc13xxx_leds_platform_data __init *mc13xxx_led_probe_dt(