]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Input: gpio_keys_polled - use device_for_each_child_node_scoped()
authorJavier Carrasco <javier.carrasco.cruz@gmail.com>
Fri, 12 Apr 2024 20:57:33 +0000 (22:57 +0200)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 16 Jul 2024 00:02:13 +0000 (17:02 -0700)
Switch to the _scoped() version introduced in commit 365130fd47af
("device property: Introduce device_for_each_child_node_scoped()")
to remove the need for manual calling of fwnode_handle_put() in the
paths where the code exits the loop early.

Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Link: https://lore.kernel.org/r/20240412-input_device_for_each_child_node_scoped-v1-4-dbad1bc7ea84@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/gpio_keys_polled.c

index b41fd1240f4312e06935685d00aded64076c3513..41ca0d3c9098562b7de9735fef775dea95d6cc7a 100644 (file)
@@ -144,7 +144,6 @@ gpio_keys_polled_get_devtree_pdata(struct device *dev)
 {
        struct gpio_keys_platform_data *pdata;
        struct gpio_keys_button *button;
-       struct fwnode_handle *child;
        int nbuttons;
 
        nbuttons = device_get_child_node_count(dev);
@@ -166,11 +165,10 @@ gpio_keys_polled_get_devtree_pdata(struct device *dev)
 
        device_property_read_string(dev, "label", &pdata->name);
 
-       device_for_each_child_node(dev, child) {
+       device_for_each_child_node_scoped(dev, child) {
                if (fwnode_property_read_u32(child, "linux,code",
                                             &button->code)) {
                        dev_err(dev, "button without keycode\n");
-                       fwnode_handle_put(child);
                        return ERR_PTR(-EINVAL);
                }