]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Input: adc-keys - use device_for_each_child_node_scoped()
authorJavier Carrasco <javier.carrasco.cruz@gmail.com>
Fri, 12 Apr 2024 20:57:34 +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-5-dbad1bc7ea84@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/adc-keys.c

index bf72ab8df817756f6f384656b109d8bb9881a3a2..f1753207429db02ce6510e5ec0da9b24d9edb61d 100644 (file)
@@ -66,7 +66,6 @@ static void adc_keys_poll(struct input_dev *input)
 static int adc_keys_load_keymap(struct device *dev, struct adc_keys_state *st)
 {
        struct adc_keys_button *map;
-       struct fwnode_handle *child;
        int i;
 
        st->num_keys = device_get_child_node_count(dev);
@@ -80,11 +79,10 @@ static int adc_keys_load_keymap(struct device *dev, struct adc_keys_state *st)
                return -ENOMEM;
 
        i = 0;
-       device_for_each_child_node(dev, child) {
+       device_for_each_child_node_scoped(dev, child) {
                if (fwnode_property_read_u32(child, "press-threshold-microvolt",
                                             &map[i].voltage)) {
                        dev_err(dev, "Key with invalid or missing voltage\n");
-                       fwnode_handle_put(child);
                        return -EINVAL;
                }
                map[i].voltage /= 1000;
@@ -92,7 +90,6 @@ static int adc_keys_load_keymap(struct device *dev, struct adc_keys_state *st)
                if (fwnode_property_read_u32(child, "linux,code",
                                             &map[i].keycode)) {
                        dev_err(dev, "Key with invalid or missing linux,code\n");
-                       fwnode_handle_put(child);
                        return -EINVAL;
                }