]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
gpio: acpi: switch to device_for_each_child_node_scoped()
authorJavier Carrasco <javier.carrasco.cruz@gmail.com>
Sat, 28 Sep 2024 19:47:37 +0000 (21:47 +0200)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 30 Sep 2024 11:25:54 +0000 (14:25 +0300)
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>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drivers/gpio/gpiolib-acpi.c

index 78ecd56123a3b6eb757a582059526ae0afda0d58..1f9fe50bba00585ddf4ae96fa20c241cfbaf853d 100644 (file)
@@ -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;
                }
        }