iio: accel: kxsd9: Make kxsd9_common_remove() return void

Up to now kxsd9_common_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>
Reviewed-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Link: https://lore.kernel.org/r/20211013203223.2694577-5-u.kleine-koenig@pengutronix.de
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/accel/kxsd9-i2c.c b/drivers/iio/accel/kxsd9-i2c.c
index b580d605f8487cf7b9d873915026ee5423766f05..274b41a6e603115dab39cd5ad5615c5f91942ddf 100644 (file)
--- a/drivers/iio/accel/kxsd9-i2c.c
+++ b/drivers/iio/accel/kxsd9-i2c.c
@@ -34,7 +34,9 @@ static int kxsd9_i2c_probe(struct i2c_client *i2c,
 
 static int kxsd9_i2c_remove(struct i2c_client *client)
 {
-       return kxsd9_common_remove(&client->dev);
+       kxsd9_common_remove(&client->dev);
+
+       return 0;
 }
 
 static const struct of_device_id kxsd9_of_match[] = {

diff --git a/drivers/iio/accel/kxsd9-spi.c b/drivers/iio/accel/kxsd9-spi.c
index 7971ec1eeb7eb87cab80a01a17da8fa67142ef00..441e6b764281c3e2c5c54188309a20e992bd9b9c 100644 (file)
--- a/drivers/iio/accel/kxsd9-spi.c
+++ b/drivers/iio/accel/kxsd9-spi.c
@@ -34,7 +34,9 @@ static int kxsd9_spi_probe(struct spi_device *spi)
 
 static int kxsd9_spi_remove(struct spi_device *spi)
 {
-       return kxsd9_common_remove(&spi->dev);
+       kxsd9_common_remove(&spi->dev);
+
+       return 0;
 }
 
 static const struct spi_device_id kxsd9_spi_id[] = {

diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
index bf7ed9e7d00f430d8e53dcc9b539c2c7dcc112cb..2faf85ca996e1daffb218df82361da71a29c02da 100644 (file)
--- a/drivers/iio/accel/kxsd9.c
+++ b/drivers/iio/accel/kxsd9.c
@@ -478,7 +478,7 @@ err_power_down:
 }
 EXPORT_SYMBOL(kxsd9_common_probe);
 
-int kxsd9_common_remove(struct device *dev)
+void kxsd9_common_remove(struct device *dev)
 {
        struct iio_dev *indio_dev = dev_get_drvdata(dev);
        struct kxsd9_state *st = iio_priv(indio_dev);
@@ -489,8 +489,6 @@ int kxsd9_common_remove(struct device *dev)
        pm_runtime_put_noidle(dev);
        pm_runtime_disable(dev);
        kxsd9_power_down(st);
-
-       return 0;
 }
 EXPORT_SYMBOL(kxsd9_common_remove);
 

diff --git a/drivers/iio/accel/kxsd9.h b/drivers/iio/accel/kxsd9.h
index 5e3ca212f5be36edc880fb354bcfb385d47f8151..c04dbfa4e0d01a3989d080cca2297e4dcdafbc5b 100644 (file)
--- a/drivers/iio/accel/kxsd9.h
+++ b/drivers/iio/accel/kxsd9.h
@@ -8,6 +8,6 @@
 int kxsd9_common_probe(struct device *dev,
                       struct regmap *map,
                       const char *name);
-int kxsd9_common_remove(struct device *dev);
+void kxsd9_common_remove(struct device *dev);
 
 extern const struct dev_pm_ops kxsd9_dev_pm_ops;