Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-04 12:12:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

leds: max77650: Switch to device_for_each_child_node_scoped()

Browse Source 
Switch to device_for_each_child_node_scoped() to simplify the code by
removing the need for calls to fwnode_handle_put() in the error paths.

This also prevents possible memory leaks if new error paths are added
without the required call to fwnode_handle_put().

After switching to the scoped variant, there is no longer need for a
jump to 'err_node_out', as an immediate return is possible.

Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Link: https://lore.kernel.org/r/20240927-leds_device_for_each_child_node_scoped-v1-11-95c0614b38c8@gmail.com
Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
Javier Carrasco 2024-09-27 01:21:02 +02:00 committed by Lee Jones
parent ba35b9a4c1
commit 4ab3ae432d
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/leds/leds-max77650.c
View File

@ -62,7 +62,6 @@ static int max77650_led_brightness_set(struct led_classdev *cdev,
static int max77650_led_probe(struct platform_device *pdev) static int max77650_led_probe(struct platform_device *pdev)
{ {
struct fwnode_handle *child;
struct max77650_led *leds, *led; struct max77650_led *leds, *led;
struct device *dev; struct device *dev;
struct regmap *map; struct regmap *map;
@ -84,14 +83,12 @@ static int max77650_led_probe(struct platform_device *pdev)
if (!num_leds || num_leds > MAX77650_LED_NUM_LEDS) if (!num_leds || num_leds > MAX77650_LED_NUM_LEDS)
return -ENODEV; return -ENODEV;
device_for_each_child_node(dev, child) { device_for_each_child_node_scoped(dev, child) {
struct led_init_data init_data = {}; struct led_init_data init_data = {};
rv = fwnode_property_read_u32(child, "reg", &reg); rv = fwnode_property_read_u32(child, "reg", &reg);
if (rv || reg >= MAX77650_LED_NUM_LEDS) { if (rv || reg >= MAX77650_LED_NUM_LEDS)
rv = -EINVAL; return -EINVAL;
goto err_node_put;
}
led = &leds[reg]; led = &leds[reg];
led->map = map; led->map = map;
@ -108,23 +105,20 @@ static int max77650_led_probe(struct platform_device *pdev)
rv = devm_led_classdev_register_ext(dev, &led->cdev, rv = devm_led_classdev_register_ext(dev, &led->cdev,
&init_data); &init_data);
if (rv) if (rv)
goto err_node_put; return rv;
rv = regmap_write(map, led->regA, MAX77650_LED_A_DEFAULT); rv = regmap_write(map, led->regA, MAX77650_LED_A_DEFAULT);
if (rv) if (rv)
goto err_node_put; return rv;
rv = regmap_write(map, led->regB, MAX77650_LED_B_DEFAULT); rv = regmap_write(map, led->regB, MAX77650_LED_B_DEFAULT);
if (rv) if (rv)
goto err_node_put; return rv;
} }
return regmap_write(map, return regmap_write(map,
MAX77650_REG_CNFG_LED_TOP, MAX77650_REG_CNFG_LED_TOP,
MAX77650_LED_TOP_DEFAULT); MAX77650_LED_TOP_DEFAULT);
err_node_put:
fwnode_handle_put(child);
return rv;
} }
static const struct of_device_id max77650_led_of_match[] = { static const struct of_device_id max77650_led_of_match[] = {