iio: accel: mma7455: Make mma7455_core_remove() return void

Up to now mma7455_core_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-6-u.kleine-koenig@pengutronix.de
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/accel/mma7455.h b/drivers/iio/accel/mma7455.h
index 4e3fa988f690c149ec4883cbea048ba0ee5f280c..1fcc4b64b3afc9bf5839d6d4a88a45513063e3a3 100644 (file)
--- a/drivers/iio/accel/mma7455.h
+++ b/drivers/iio/accel/mma7455.h
@@ -11,6 +11,6 @@ extern const struct regmap_config mma7455_core_regmap;
 
 int mma7455_core_probe(struct device *dev, struct regmap *regmap,
                       const char *name);
-int mma7455_core_remove(struct device *dev);
+void mma7455_core_remove(struct device *dev);
 
 #endif

diff --git a/drivers/iio/accel/mma7455_core.c b/drivers/iio/accel/mma7455_core.c
index 922bd38ff6ea971dcfb1e543314cb7969ba8b4e9..777c6c384b09eb488118b7ee324bf7a54713fb70 100644 (file)
--- a/drivers/iio/accel/mma7455_core.c
+++ b/drivers/iio/accel/mma7455_core.c
@@ -294,7 +294,7 @@ int mma7455_core_probe(struct device *dev, struct regmap *regmap,
 }
 EXPORT_SYMBOL_GPL(mma7455_core_probe);
 
-int mma7455_core_remove(struct device *dev)
+void mma7455_core_remove(struct device *dev)
 {
        struct iio_dev *indio_dev = dev_get_drvdata(dev);
        struct mma7455_data *mma7455 = iio_priv(indio_dev);
@@ -304,8 +304,6 @@ int mma7455_core_remove(struct device *dev)
 
        regmap_write(mma7455->regmap, MMA7455_REG_MCTL,
                     MMA7455_MCTL_MODE_STANDBY);
-
-       return 0;
 }
 EXPORT_SYMBOL_GPL(mma7455_core_remove);
 

diff --git a/drivers/iio/accel/mma7455_i2c.c b/drivers/iio/accel/mma7455_i2c.c
index cddeaa9e230a7442fe65062c4a2256bce28a9cf7..8a5256516f9fd508f7af5594c2984fa187c3c905 100644 (file)
--- a/drivers/iio/accel/mma7455_i2c.c
+++ b/drivers/iio/accel/mma7455_i2c.c
@@ -28,7 +28,9 @@ static int mma7455_i2c_probe(struct i2c_client *i2c,
 
 static int mma7455_i2c_remove(struct i2c_client *i2c)
 {
-       return mma7455_core_remove(&i2c->dev);
+       mma7455_core_remove(&i2c->dev);
+
+       return 0;
 }
 
 static const struct i2c_device_id mma7455_i2c_ids[] = {

diff --git a/drivers/iio/accel/mma7455_spi.c b/drivers/iio/accel/mma7455_spi.c
index eb82cdfa8abc514b8cc7dc3d3a86957ca95f0596..ecf690692dcc85c83d8023f3d0282e06032d8b70 100644 (file)
--- a/drivers/iio/accel/mma7455_spi.c
+++ b/drivers/iio/accel/mma7455_spi.c
@@ -24,7 +24,9 @@ static int mma7455_spi_probe(struct spi_device *spi)
 
 static int mma7455_spi_remove(struct spi_device *spi)
 {
-       return mma7455_core_remove(&spi->dev);
+       mma7455_core_remove(&spi->dev);
+
+       return 0;
 }
 
 static const struct spi_device_id mma7455_spi_ids[] = {