Input: adxl34x - 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@pengutronix.de>
Link: https://lore.kernel.org/r/20211012153945.2651412-6-u.kleine-koenig@pengutronix.de
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/misc/adxl34x-i2c.c b/drivers/input/misc/adxl34x-i2c.c
index e64368a633466bf695913cd5dff1e43747eaba42..a3b5f88d2bd1603f0e7bac1164ccce40d953c1fd 100644 (file)
--- 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 df6afa455e4650f88f540255a3e3f246503f3b3c..6e51c9bc619f2b2a875c0214d3e1eb887b431c22 100644 (file)
--- 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 4cc4e8ff42b33fa6c2e61d7e539e1c9a2561f284..34beac80e6f0a2a28f06b669eece6533d1980b98 100644 (file)
--- 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 83a0eeccf613379c48b3cf1df9f76bb69f90509d..febf85270fff494efeba49d77cf9b669f428a0a0 100644 (file)
--- 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