| Message ID | 20240928-gpio_device_for_each_child_node_scoped-v1-3-c20eff315f4f@gmail.com |
|---|---|
| State | Accepted |
| Commit | 12b0e305f50988b0c75f052f86d51b5353108ca5 |
| Headers | show |
| Series | gpio: switch to device_for_each_chilld_node_scoped() | expand |
On Sat, Sep 28, 2024 at 09:47:37PM +0200, Javier Carrasco wrote: > Switch to device_for_each_child_node_scoped() to simplify the code by > removing the need for a call to fwnode_handle_put() in the error path. > > This also prevents possible memory leaks if new error paths are added > without the required call to fwnode_handle_put(). Pushed to my review and testing queue, thanks!
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index 78ecd56123a3..1f9fe50bba00 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -1315,9 +1315,8 @@ acpi_gpiochip_parse_own_gpio(struct acpi_gpio_chip *achip, static void acpi_gpiochip_scan_gpios(struct acpi_gpio_chip *achip) { struct gpio_chip *chip = achip->chip; - struct fwnode_handle *fwnode; - device_for_each_child_node(chip->parent, fwnode) { + device_for_each_child_node_scoped(chip->parent, fwnode) { unsigned long lflags; enum gpiod_flags dflags; struct gpio_desc *desc; @@ -1335,7 +1334,6 @@ static void acpi_gpiochip_scan_gpios(struct acpi_gpio_chip *achip) ret = gpiod_hog(desc, name, lflags, dflags); if (ret) { dev_err(chip->parent, "Failed to hog GPIO\n"); - fwnode_handle_put(fwnode); return; } }
Switch to device_for_each_child_node_scoped() to simplify the code by removing the need for a call to fwnode_handle_put() in the error path. This also prevents possible memory leaks if new error paths are added without the required call to fwnode_handle_put(). Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com> --- drivers/gpio/gpiolib-acpi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)