RE: [PATCH v2 05/20] input: adxl34xx: Make adxl34x_remove() return void

["Hennerich, Michael" <Michael.Hennerich@xxxxxxxxxx>]

> -----Original Message-----
> From: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
> Sent: Dienstag, 12. Oktober 2021 17:40
> To: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>; Hennerich, Michael
> <Michael.Hennerich@xxxxxxxxxx>
> Cc: Mark Brown <broonie@xxxxxxxxxx>; kernel@xxxxxxxxxxxxxx; linux-
> input@xxxxxxxxxxxxxxx; linux-spi@xxxxxxxxxxxxxxx
> Subject: [PATCH v2 05/20] input: adxl34xx: Make adxl34x_remove() return void
> 
> Up to now adxl34x_remove() returns zero unconditionally. Make it return void
> instead which makes it easier to see in the callers that there is no error to
> handle.
> 
> Also the return value of i2c and spi remove callbacks is ignored anyway.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>

Acked-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>

> ---
>  drivers/input/misc/adxl34x-i2c.c | 4 +++-  drivers/input/misc/adxl34x-spi.c | 4
> +++-
>  drivers/input/misc/adxl34x.c     | 4 +---
>  drivers/input/misc/adxl34x.h     | 2 +-
>  4 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/input/misc/adxl34x-i2c.c b/drivers/input/misc/adxl34x-i2c.c
> index e64368a63346..a3b5f88d2bd1 100644
> --- a/drivers/input/misc/adxl34x-i2c.c
> +++ b/drivers/input/misc/adxl34x-i2c.c
> @@ -103,7 +103,9 @@ static int adxl34x_i2c_remove(struct i2c_client *client)
> {
>  	struct adxl34x *ac = i2c_get_clientdata(client);
> 
> -	return adxl34x_remove(ac);
> +	adxl34x_remove(ac);
> +
> +	return 0;
>  }
> 
>  static int __maybe_unused adxl34x_i2c_suspend(struct device *dev) diff --git
> a/drivers/input/misc/adxl34x-spi.c b/drivers/input/misc/adxl34x-spi.c
> index df6afa455e46..6e51c9bc619f 100644
> --- a/drivers/input/misc/adxl34x-spi.c
> +++ b/drivers/input/misc/adxl34x-spi.c
> @@ -91,7 +91,9 @@ static int adxl34x_spi_remove(struct spi_device *spi)  {
>  	struct adxl34x *ac = spi_get_drvdata(spi);
> 
> -	return adxl34x_remove(ac);
> +	adxl34x_remove(ac);
> +
> +	return 0;
>  }
> 
>  static int __maybe_unused adxl34x_spi_suspend(struct device *dev) diff --git
> a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c index
> 4cc4e8ff42b3..34beac80e6f0 100644
> --- a/drivers/input/misc/adxl34x.c
> +++ b/drivers/input/misc/adxl34x.c
> @@ -896,15 +896,13 @@ struct adxl34x *adxl34x_probe(struct device *dev,
> int irq,  }  EXPORT_SYMBOL_GPL(adxl34x_probe);
> 
> -int adxl34x_remove(struct adxl34x *ac)
> +void adxl34x_remove(struct adxl34x *ac)
>  {
>  	sysfs_remove_group(&ac->dev->kobj, &adxl34x_attr_group);
>  	free_irq(ac->irq, ac);
>  	input_unregister_device(ac->input);
>  	dev_dbg(ac->dev, "unregistered accelerometer\n");
>  	kfree(ac);
> -
> -	return 0;
>  }
>  EXPORT_SYMBOL_GPL(adxl34x_remove);
> 
> diff --git a/drivers/input/misc/adxl34x.h b/drivers/input/misc/adxl34x.h index
> 83a0eeccf613..febf85270fff 100644
> --- a/drivers/input/misc/adxl34x.h
> +++ b/drivers/input/misc/adxl34x.h
> @@ -25,6 +25,6 @@ void adxl34x_resume(struct adxl34x *ac);  struct adxl34x
> *adxl34x_probe(struct device *dev, int irq,
>  			      bool fifo_delay_default,
>  			      const struct adxl34x_bus_ops *bops); -int
> adxl34x_remove(struct adxl34x *ac);
> +void adxl34x_remove(struct adxl34x *ac);
> 
>  #endif
> --
> 2.30.2