Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

leds: pca963x: Switch to device_for_each_child_node_scoped() 

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', as an immediate return is possible.

Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Link: https://lore.kernel.org/r/20240927-leds_device_for_each_child_node_scoped-v1-13-95c0614b38c8@gmail.com
Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
Javier Carrasco 2024-09-27 01:21:04 +02:00 committed by Lee Jones
parent 5b5d936db0
commit dea90acb09
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/leds/leds-pca963x.c
View File

@ -306,7 +306,6 @@ static int pca963x_register_leds(struct i2c_client *client,
struct pca963x_chipdef *chipdef = chip->chipdef; struct pca963x_chipdef *chipdef = chip->chipdef;
struct pca963x_led *led = chip->leds; struct pca963x_led *led = chip->leds;
struct device *dev = &client->dev; struct device *dev = &client->dev;
struct fwnode_handle *child;
bool hw_blink; bool hw_blink;
s32 mode2; s32 mode2;
u32 reg; u32 reg;
@ -338,7 +337,7 @@ static int pca963x_register_leds(struct i2c_client *client,
if (ret < 0) if (ret < 0)
return ret; return ret;
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 = {};
char default_label[32]; char default_label[32];
@ -346,8 +345,7 @@ static int pca963x_register_leds(struct i2c_client *client,
if (ret || reg >= chipdef->n_leds) { if (ret || reg >= chipdef->n_leds) {
dev_err(dev, "Invalid 'reg' property for node %pfw\n", dev_err(dev, "Invalid 'reg' property for node %pfw\n",
child); child);
ret = -EINVAL; return -EINVAL;
goto err;
} }
led->led_num = reg; led->led_num = reg;
@ -369,16 +367,13 @@ static int pca963x_register_leds(struct i2c_client *client,
if (ret) { if (ret) {
dev_err(dev, "Failed to register LED for node %pfw\n", dev_err(dev, "Failed to register LED for node %pfw\n",
child); child);
goto err; return ret;
} }
++led; ++led;
} }
return 0; return 0;
err:
fwnode_handle_put(child);
return ret;
} }
static int pca963x_suspend(struct device *dev) static int pca963x_suspend(struct device *dev)