[PATCH v7 0/3] adc-joystick: Add polled support

[PATCH v7 0/3] adc-joystick: Add polled support

[Chris Morgan]

From: Chris Morgan <macroalpha82@gmail.com>

Add support to the existing adc-joystick driver to support polling
rather than relying on triggered buffers. This is useful for devices
that do not offer triggered buffers in hardware. Code adapted from
changes made by Maya Matuszczyk <maccraft123mc@gmail.com>.

Changes from V6:
 - Reverted back to "poll-interval" after mailing list discussion.
 - Referenced input.yaml for definition of poll-interval in adc-joystick
   documentation.

Changes from V5:
 - Corrected an error found by yamllint in the documentation.

Changes from V4:
 - Added unit property to devicetree attribute making it now
   "poll-interval-ms".
 - Simplified logic for setting polled value and made variable names
   more clear.

Changes from V3:
 - After lengthy discussion decided to support with existing attribute
   of "poll-interval". If present, the driver will use polling and if
   not present, it will use triggered buffers (as the driver does
   today).
 - Corrected some lines to honor the 80 character line-limit.
 - Check return value from polling method and return early if there
   is an error reading the data.

Changes from V2:
 - Changed parameter from "adc-joystick,polled" to
   "adc-joystick,no-hardware-trigger" as it is more representative of
   what the driver and hardware are doing.

Changes from V1:
 - Removed driver compatible string of "adc-joystick-polled".
 - Added new optional boolean value of "adc-joystick,polled".
 - Cleaned up if statements regarding polling behavior.


Chris Morgan (3):
  dt-bindings: adc-joystick: add poll-interval
  Input: adc-joystick - Add polled input device support
  arm64: dts: rockchip: Update joystick to polled for OG2

 .../bindings/input/adc-joystick.yaml          |  5 ++
 .../boot/dts/rockchip/rk3326-odroid-go2.dts   |  1 +
 drivers/input/joystick/adc-joystick.c         | 51 +++++++++++++++----
 3 files changed, 46 insertions(+), 11 deletions(-)

-- 
2.34.1

[PATCH v7 1/3] dt-bindings: adc-joystick: add poll-interval

[Chris Morgan]

From: Chris Morgan <macroalpha82@gmail.com>

Add poll-interval support for the adc-joystick documentation. This is
an optional value and if not provided the adc-joystick works as it
does today (with buffers). If this value is provided, the adc-joystick
driver is polled at the specified interval. The existing attribute of
"poll-interval" was used instead of complying with property-units.yaml
after discussion of the issue on the mailing list.

Signed-off-by: Maya Matuszczyk <maccraft123mc@gmail.com>
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
 Documentation/devicetree/bindings/input/adc-joystick.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Documentation/devicetree/bindings/input/adc-joystick.yaml b/Documentation/devicetree/bindings/input/adc-joystick.yaml
index 2ee04e03bc22..ab5caad055ea 100644
--- a/Documentation/devicetree/bindings/input/adc-joystick.yaml
+++ b/Documentation/devicetree/bindings/input/adc-joystick.yaml
@@ -14,6 +14,9 @@ description: >
   Bindings for joystick devices connected to ADC controllers supporting
   the Industrial I/O subsystem.
 
+allOf:
+  - $ref: input.yaml#
+
 properties:
   compatible:
     const: adc-joystick
@@ -28,6 +31,8 @@ properties:
       https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml
       for details.
 
+  poll-interval: true
+
   '#address-cells':
     const: 1
 
-- 
2.34.1

[PATCH v7 2/3] Input: adc-joystick - Add polled input device support

[Chris Morgan]

From: Chris Morgan <macroalpha82@gmail.com>

Add polled input device support to the adc-joystick driver. This is
useful for devices which do not have hardware capable triggers on
their SARADC. Code modified from adc-joystick.c changes made by Maya
Matuszczyk.

Signed-off-by: Maya Matuszczyk <maccraft123mc@gmail.com>
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
 drivers/input/joystick/adc-joystick.c | 51 +++++++++++++++++++++------
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/drivers/input/joystick/adc-joystick.c b/drivers/input/joystick/adc-joystick.c
index 78ebca7d400a..2f4bd12d6344 100644
--- a/drivers/input/joystick/adc-joystick.c
+++ b/drivers/input/joystick/adc-joystick.c
@@ -26,8 +26,23 @@ struct adc_joystick {
 	struct adc_joystick_axis *axes;
 	struct iio_channel *chans;
 	int num_chans;
+	bool polled;
 };
 
+static void adc_joystick_poll(struct input_dev *input)
+{
+	struct adc_joystick *joy = input_get_drvdata(input);
+	int i, val, ret;
+
+	for (i = 0; i < joy->num_chans; i++) {
+		ret = iio_read_channel_raw(&joy->chans[i], &val);
+		if (ret < 0)
+			return;
+		input_report_abs(input, joy->axes[i].code, val);
+	}
+	input_sync(input);
+}
+
 static int adc_joystick_handle(const void *data, void *private)
 {
 	struct adc_joystick *joy = private;
@@ -179,6 +194,7 @@ static int adc_joystick_probe(struct platform_device *pdev)
 	int error;
 	int bits;
 	int i;
+	unsigned int poll_interval;
 
 	joy = devm_kzalloc(dev, sizeof(*joy), GFP_KERNEL);
 	if (!joy)
@@ -215,8 +231,17 @@ static int adc_joystick_probe(struct platform_device *pdev)
 	joy->input = input;
 	input->name = pdev->name;
 	input->id.bustype = BUS_HOST;
-	input->open = adc_joystick_open;
-	input->close = adc_joystick_close;
+
+	joy->polled = !device_property_read_u32(dev, "poll-interval",
+						&poll_interval);
+
+	if (joy->polled) {
+		input_setup_polling(input, adc_joystick_poll);
+		input_set_poll_interval(input, poll_interval);
+	} else {
+		input->open = adc_joystick_open;
+		input->close = adc_joystick_close;
+	}
 
 	error = adc_joystick_set_axes(dev, joy);
 	if (error)
@@ -229,16 +254,20 @@ static int adc_joystick_probe(struct platform_device *pdev)
 		return error;
 	}
 
-	joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle, joy);
-	if (IS_ERR(joy->buffer)) {
-		dev_err(dev, "Unable to allocate callback buffer\n");
-		return PTR_ERR(joy->buffer);
-	}
+	if (!joy->polled) {
+		joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle,
+						     joy);
+		if (IS_ERR(joy->buffer)) {
+			dev_err(dev, "Unable to allocate callback buffer\n");
+			return PTR_ERR(joy->buffer);
+		}
 
-	error = devm_add_action_or_reset(dev, adc_joystick_cleanup, joy->buffer);
-	if (error)  {
-		dev_err(dev, "Unable to add action\n");
-		return error;
+		error = devm_add_action_or_reset(dev, adc_joystick_cleanup,
+						 joy->buffer);
+		if (error)  {
+			dev_err(dev, "Unable to add action\n");
+			return error;
+		}
 	}
 
 	return 0;
-- 
2.34.1

[PATCH v7 3/3] arm64: dts: rockchip: Update joystick to polled for OG2

[Chris Morgan]

From: Chris Morgan <macroalpha82@gmail.com>

Update the Odroid Go Advance to use "poll-interval" from the
adc-joystick driver.

Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
Signed-off-by: Maya Matuszczyk <maccraft123mc@gmail.com>
---
 arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
index ea0695b51ecd..61583c3f24e6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
@@ -26,6 +26,7 @@ adc-joystick {
 		compatible = "adc-joystick";
 		io-channels = <&saradc 1>,
 			      <&saradc 2>;
+		poll-interval = <60>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-- 
2.34.1

Re: [PATCH v7 1/3] dt-bindings: adc-joystick: add poll-interval

[Rob Herring]

On Tue, 05 Jul 2022 14:03:52 -0500, Chris Morgan wrote:
> From: Chris Morgan <macroalpha82@gmail.com>
> 
> Add poll-interval support for the adc-joystick documentation. This is
> an optional value and if not provided the adc-joystick works as it
> does today (with buffers). If this value is provided, the adc-joystick
> driver is polled at the specified interval. The existing attribute of
> "poll-interval" was used instead of complying with property-units.yaml
> after discussion of the issue on the mailing list.
> 
> Signed-off-by: Maya Matuszczyk <maccraft123mc@gmail.com>
> Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> ---
>  Documentation/devicetree/bindings/input/adc-joystick.yaml | 5 +++++
>  1 file changed, 5 insertions(+)
> 

Reviewed-by: Rob Herring <robh@kernel.org>

Re: [PATCH v7 2/3] Input: adc-joystick - Add polled input device support

[Artur Rojek]

On 2022-07-05 21:03, Chris Morgan wrote:
> From: Chris Morgan <macroalpha82@gmail.com>
> 
> Add polled input device support to the adc-joystick driver. This is
> useful for devices which do not have hardware capable triggers on
> their SARADC. Code modified from adc-joystick.c changes made by Maya
> Matuszczyk.
> 
> Signed-off-by: Maya Matuszczyk <maccraft123mc@gmail.com>
> Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> ---
Just copying my Acked-by from v6, as it seems to have been lost.

Acked-by: Artur Rojek <contact@artur-rojek.eu>
>  drivers/input/joystick/adc-joystick.c | 51 +++++++++++++++++++++------
>  1 file changed, 40 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/input/joystick/adc-joystick.c
> b/drivers/input/joystick/adc-joystick.c
> index 78ebca7d400a..2f4bd12d6344 100644
> --- a/drivers/input/joystick/adc-joystick.c
> +++ b/drivers/input/joystick/adc-joystick.c
> @@ -26,8 +26,23 @@ struct adc_joystick {
>  	struct adc_joystick_axis *axes;
>  	struct iio_channel *chans;
>  	int num_chans;
> +	bool polled;
>  };
> 
> +static void adc_joystick_poll(struct input_dev *input)
> +{
> +	struct adc_joystick *joy = input_get_drvdata(input);
> +	int i, val, ret;
> +
> +	for (i = 0; i < joy->num_chans; i++) {
> +		ret = iio_read_channel_raw(&joy->chans[i], &val);
> +		if (ret < 0)
> +			return;
> +		input_report_abs(input, joy->axes[i].code, val);
> +	}
> +	input_sync(input);
> +}
> +
>  static int adc_joystick_handle(const void *data, void *private)
>  {
>  	struct adc_joystick *joy = private;
> @@ -179,6 +194,7 @@ static int adc_joystick_probe(struct 
> platform_device *pdev)
>  	int error;
>  	int bits;
>  	int i;
> +	unsigned int poll_interval;
> 
>  	joy = devm_kzalloc(dev, sizeof(*joy), GFP_KERNEL);
>  	if (!joy)
> @@ -215,8 +231,17 @@ static int adc_joystick_probe(struct 
> platform_device *pdev)
>  	joy->input = input;
>  	input->name = pdev->name;
>  	input->id.bustype = BUS_HOST;
> -	input->open = adc_joystick_open;
> -	input->close = adc_joystick_close;
> +
> +	joy->polled = !device_property_read_u32(dev, "poll-interval",
> +						&poll_interval);
> +
> +	if (joy->polled) {
> +		input_setup_polling(input, adc_joystick_poll);
> +		input_set_poll_interval(input, poll_interval);
> +	} else {
> +		input->open = adc_joystick_open;
> +		input->close = adc_joystick_close;
> +	}
> 
>  	error = adc_joystick_set_axes(dev, joy);
>  	if (error)
> @@ -229,16 +254,20 @@ static int adc_joystick_probe(struct
> platform_device *pdev)
>  		return error;
>  	}
> 
> -	joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle, joy);
> -	if (IS_ERR(joy->buffer)) {
> -		dev_err(dev, "Unable to allocate callback buffer\n");
> -		return PTR_ERR(joy->buffer);
> -	}
> +	if (!joy->polled) {
> +		joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle,
> +						     joy);
> +		if (IS_ERR(joy->buffer)) {
> +			dev_err(dev, "Unable to allocate callback buffer\n");
> +			return PTR_ERR(joy->buffer);
> +		}
> 
> -	error = devm_add_action_or_reset(dev, adc_joystick_cleanup, 
> joy->buffer);
> -	if (error)  {
> -		dev_err(dev, "Unable to add action\n");
> -		return error;
> +		error = devm_add_action_or_reset(dev, adc_joystick_cleanup,
> +						 joy->buffer);
> +		if (error)  {
> +			dev_err(dev, "Unable to add action\n");
> +			return error;
> +		}
>  	}
> 
>  	return 0;

Re: [PATCH v7 1/3] dt-bindings: adc-joystick: add poll-interval

[Artur Rojek]

On 2022-07-06 16:37, Rob Herring wrote:
> On Tue, 05 Jul 2022 14:03:52 -0500, Chris Morgan wrote:
>> From: Chris Morgan <macroalpha82@gmail.com>
>> 
>> Add poll-interval support for the adc-joystick documentation. This is
>> an optional value and if not provided the adc-joystick works as it
>> does today (with buffers). If this value is provided, the adc-joystick
>> driver is polled at the specified interval. The existing attribute of
>> "poll-interval" was used instead of complying with property-units.yaml
>> after discussion of the issue on the mailing list.
>> 
>> Signed-off-by: Maya Matuszczyk <maccraft123mc@gmail.com>
>> Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
>> ---
>>  Documentation/devicetree/bindings/input/adc-joystick.yaml | 5 +++++
>>  1 file changed, 5 insertions(+)
>> 
> 
> Reviewed-by: Rob Herring <robh@kernel.org>

Acked-by: Artur Rojek <contact@artur-rojek.eu>

Re: [PATCH v7 2/3] Input: adc-joystick - Add polled input device support

[Jonathan Cameron]

On Tue,  5 Jul 2022 14:03:53 -0500
Chris Morgan <macroalpha82@gmail.com> wrote:

> From: Chris Morgan <macroalpha82@gmail.com>
> 
> Add polled input device support to the adc-joystick driver. This is
> useful for devices which do not have hardware capable triggers on
> their SARADC. Code modified from adc-joystick.c changes made by Maya
> Matuszczyk.
> 
> Signed-off-by: Maya Matuszczyk <maccraft123mc@gmail.com>
> Signed-off-by: Chris Morgan <macromorgan@hotmail.com>

Hi.

One comment inline on improving the error handling slightly.

Thanks,

Jonathan

> ---
>  drivers/input/joystick/adc-joystick.c | 51 +++++++++++++++++++++------
>  1 file changed, 40 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/input/joystick/adc-joystick.c b/drivers/input/joystick/adc-joystick.c
> index 78ebca7d400a..2f4bd12d6344 100644
> --- a/drivers/input/joystick/adc-joystick.c
> +++ b/drivers/input/joystick/adc-joystick.c
> @@ -26,8 +26,23 @@ struct adc_joystick {
>  	struct adc_joystick_axis *axes;
>  	struct iio_channel *chans;
>  	int num_chans;
> +	bool polled;
>  };
>  
> +static void adc_joystick_poll(struct input_dev *input)
> +{
> +	struct adc_joystick *joy = input_get_drvdata(input);
> +	int i, val, ret;
> +
> +	for (i = 0; i < joy->num_chans; i++) {
> +		ret = iio_read_channel_raw(&joy->chans[i], &val);
> +		if (ret < 0)
> +			return;
> +		input_report_abs(input, joy->axes[i].code, val);
> +	}
> +	input_sync(input);
> +}
> +
>  static int adc_joystick_handle(const void *data, void *private)
>  {
>  	struct adc_joystick *joy = private;
> @@ -179,6 +194,7 @@ static int adc_joystick_probe(struct platform_device *pdev)
>  	int error;
>  	int bits;
>  	int i;
> +	unsigned int poll_interval;
>  
>  	joy = devm_kzalloc(dev, sizeof(*joy), GFP_KERNEL);
>  	if (!joy)
> @@ -215,8 +231,17 @@ static int adc_joystick_probe(struct platform_device *pdev)
>  	joy->input = input;
>  	input->name = pdev->name;
>  	input->id.bustype = BUS_HOST;
> -	input->open = adc_joystick_open;
> -	input->close = adc_joystick_close;
> +
> +	joy->polled = !device_property_read_u32(dev, "poll-interval",
> +						&poll_interval);
Slight preference for an explicit check on presence of property
	
	if (device_property_present(dev, "poll-interval")) {
		error = device_property_read_u32();
		if (error)
			return error;
		input_setup_polling(input, adc_joystick_poll);
		input_set_poll_interval(input, poll_interval);
	} else {
		input->open = adc_joystick_open;
		input->close = adc_joystick_close;
	}

That way we will return an error if there is a malformed property.

> +
> +	if (joy->polled) {
> +		input_setup_polling(input, adc_joystick_poll);
> +		input_set_poll_interval(input, poll_interval);
> +	} else {
> +		input->open = adc_joystick_open;
> +		input->close = adc_joystick_close;
> +	}
>  
>  	error = adc_joystick_set_axes(dev, joy);
>  	if (error)
> @@ -229,16 +254,20 @@ static int adc_joystick_probe(struct platform_device *pdev)
>  		return error;
>  	}
>  
> -	joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle, joy);
> -	if (IS_ERR(joy->buffer)) {
> -		dev_err(dev, "Unable to allocate callback buffer\n");
> -		return PTR_ERR(joy->buffer);
> -	}
> +	if (!joy->polled) {
> +		joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle,
> +						     joy);
> +		if (IS_ERR(joy->buffer)) {
> +			dev_err(dev, "Unable to allocate callback buffer\n");
> +			return PTR_ERR(joy->buffer);
> +		}
>  
> -	error = devm_add_action_or_reset(dev, adc_joystick_cleanup, joy->buffer);
> -	if (error)  {
> -		dev_err(dev, "Unable to add action\n");
> -		return error;
> +		error = devm_add_action_or_reset(dev, adc_joystick_cleanup,
> +						 joy->buffer);
> +		if (error)  {
> +			dev_err(dev, "Unable to add action\n");
> +			return error;
> +		}
>  	}
>  
>  	return 0;

Re: [PATCH v7 2/3] Input: adc-joystick - Add polled input device support

[Artur Rojek]

On 2022-07-16 17:58, Jonathan Cameron wrote:
> On Tue,  5 Jul 2022 14:03:53 -0500
> Chris Morgan <macroalpha82@gmail.com> wrote:
> 
>> From: Chris Morgan <macroalpha82@gmail.com>
>> 
>> Add polled input device support to the adc-joystick driver. This is
>> useful for devices which do not have hardware capable triggers on
>> their SARADC. Code modified from adc-joystick.c changes made by Maya
>> Matuszczyk.
>> 
>> Signed-off-by: Maya Matuszczyk <maccraft123mc@gmail.com>
>> Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> 
> Hi.
> 
> One comment inline on improving the error handling slightly.
> 
> Thanks,
> 
> Jonathan
> 
>> ---
>>  drivers/input/joystick/adc-joystick.c | 51 
>> +++++++++++++++++++++------
>>  1 file changed, 40 insertions(+), 11 deletions(-)
>> 
>> diff --git a/drivers/input/joystick/adc-joystick.c 
>> b/drivers/input/joystick/adc-joystick.c
>> index 78ebca7d400a..2f4bd12d6344 100644
>> --- a/drivers/input/joystick/adc-joystick.c
>> +++ b/drivers/input/joystick/adc-joystick.c
>> @@ -26,8 +26,23 @@ struct adc_joystick {
>>  	struct adc_joystick_axis *axes;
>>  	struct iio_channel *chans;
>>  	int num_chans;
>> +	bool polled;
>>  };
>> 
>> +static void adc_joystick_poll(struct input_dev *input)
>> +{
>> +	struct adc_joystick *joy = input_get_drvdata(input);
>> +	int i, val, ret;
>> +
>> +	for (i = 0; i < joy->num_chans; i++) {
>> +		ret = iio_read_channel_raw(&joy->chans[i], &val);
>> +		if (ret < 0)
>> +			return;
>> +		input_report_abs(input, joy->axes[i].code, val);
>> +	}
>> +	input_sync(input);
>> +}
>> +
>>  static int adc_joystick_handle(const void *data, void *private)
>>  {
>>  	struct adc_joystick *joy = private;
>> @@ -179,6 +194,7 @@ static int adc_joystick_probe(struct 
>> platform_device *pdev)
>>  	int error;
>>  	int bits;
>>  	int i;
>> +	unsigned int poll_interval;
>> 
>>  	joy = devm_kzalloc(dev, sizeof(*joy), GFP_KERNEL);
>>  	if (!joy)
>> @@ -215,8 +231,17 @@ static int adc_joystick_probe(struct 
>> platform_device *pdev)
>>  	joy->input = input;
>>  	input->name = pdev->name;
>>  	input->id.bustype = BUS_HOST;
>> -	input->open = adc_joystick_open;
>> -	input->close = adc_joystick_close;
>> +
>> +	joy->polled = !device_property_read_u32(dev, "poll-interval",
>> +						&poll_interval);
> Slight preference for an explicit check on presence of property
> 
> 	if (device_property_present(dev, "poll-interval")) {
> 		error = device_property_read_u32();
> 		if (error)
> 			return error;
> 		input_setup_polling(input, adc_joystick_poll);
> 		input_set_poll_interval(input, poll_interval);
> 	} else {
> 		input->open = adc_joystick_open;
> 		input->close = adc_joystick_close;
> 	}
> 
> That way we will return an error if there is a malformed property.
I'm fine with that, just let's keep the polling setup logic outside the 
DT parsing code, like it was in v7:
```
	if (device_property_present(dev, "poll-interval")) {
		error = device_property_read_u32(dev, "poll-interval",
						 &poll_interval);
		if (error)
			return error;
		joy->polled = true;
	}

	if (joy->polled) {
		input_setup_polling(input, adc_joystick_poll);
		input_set_poll_interval(input, poll_interval);
	} else {
		input->open = adc_joystick_open;
		input->close = adc_joystick_close;
	}

```

Cheers,
Artur
> 
>> +
>> +	if (joy->polled) {
>> +		input_setup_polling(input, adc_joystick_poll);
>> +		input_set_poll_interval(input, poll_interval);
>> +	} else {
>> +		input->open = adc_joystick_open;
>> +		input->close = adc_joystick_close;
>> +	}
>> 
>>  	error = adc_joystick_set_axes(dev, joy);
>>  	if (error)
>> @@ -229,16 +254,20 @@ static int adc_joystick_probe(struct 
>> platform_device *pdev)
>>  		return error;
>>  	}
>> 
>> -	joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle, joy);
>> -	if (IS_ERR(joy->buffer)) {
>> -		dev_err(dev, "Unable to allocate callback buffer\n");
>> -		return PTR_ERR(joy->buffer);
>> -	}
>> +	if (!joy->polled) {
>> +		joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle,
>> +						     joy);
>> +		if (IS_ERR(joy->buffer)) {
>> +			dev_err(dev, "Unable to allocate callback buffer\n");
>> +			return PTR_ERR(joy->buffer);
>> +		}
>> 
>> -	error = devm_add_action_or_reset(dev, adc_joystick_cleanup, 
>> joy->buffer);
>> -	if (error)  {
>> -		dev_err(dev, "Unable to add action\n");
>> -		return error;
>> +		error = devm_add_action_or_reset(dev, adc_joystick_cleanup,
>> +						 joy->buffer);
>> +		if (error)  {
>> +			dev_err(dev, "Unable to add action\n");
>> +			return error;
>> +		}
>>  	}
>> 
>>  	return 0;