Input: adc-joystick - use device_for_each_child_node_scoped()

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.

In this case the err_fwnode_put label was no longer necessary and the
error code is returned directly.

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-6-dbad1bc7ea84@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/joystick/adc-joystick.c b/drivers/input/joystick/adc-joystick.c
index 5f46a7104b52a47406865dccd2174954ee60f006..130245be884bcf186857e36bb8bf9f886bcf4eba 100644 (file)
--- a/drivers/input/joystick/adc-joystick.c
+++ b/drivers/input/joystick/adc-joystick.c
@@ -132,7 +132,6 @@ static void adc_joystick_cleanup(void *data)
 static int adc_joystick_set_axes(struct device *dev, struct adc_joystick *joy)
 {
        struct adc_joystick_axis *axes = joy->axes;
-       struct fwnode_handle *child;
        s32 range[2], fuzz, flat;
        unsigned int num_axes;
        int error, i;
@@ -149,31 +148,30 @@ static int adc_joystick_set_axes(struct device *dev, struct adc_joystick *joy)
                return -EINVAL;
        }
 
-       device_for_each_child_node(dev, child) {
+       device_for_each_child_node_scoped(dev, child) {
                error = fwnode_property_read_u32(child, "reg", &i);
                if (error) {
                        dev_err(dev, "reg invalid or missing\n");
-                       goto err_fwnode_put;
+                       return error;
                }
 
                if (i >= num_axes) {
-                       error = -EINVAL;
                        dev_err(dev, "No matching axis for reg %d\n", i);
-                       goto err_fwnode_put;
+                       return -EINVAL;
                }
 
                error = fwnode_property_read_u32(child, "linux,code",
                                                 &axes[i].code);
                if (error) {
                        dev_err(dev, "linux,code invalid or missing\n");
-                       goto err_fwnode_put;
+                       return error;
                }
 
                error = fwnode_property_read_u32_array(child, "abs-range",
                                                       range, 2);
                if (error) {
                        dev_err(dev, "abs-range invalid or missing\n");
-                       goto err_fwnode_put;
+                       return error;
                }
 
                if (range[0] > range[1]) {
@@ -190,10 +188,6 @@ static int adc_joystick_set_axes(struct device *dev, struct adc_joystick *joy)
        }
 
        return 0;
-
-err_fwnode_put:
-       fwnode_handle_put(child);
-       return error;
 }