iio: accel: bma400: Make bma400_remove() return void

When an i2c or spi driver's remove function returns a non-zero error
code nothing happens apart from emitting a generic error message. Make
this error message more device specific and return zero instead in the
remove callbacks. As the return value of bma400_remove() is unused then,
change the function to not yield a return value.

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-2-u.kleine-koenig@pengutronix.de
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/accel/bma400.h b/drivers/iio/accel/bma400.h
index 5ad10db9819fe5d489420741d331a09353118165..c4c8d74155c2abe6609486d33cb10e1f13cdde50 100644 (file)
--- a/drivers/iio/accel/bma400.h
+++ b/drivers/iio/accel/bma400.h
@@ -94,6 +94,6 @@ extern const struct regmap_config bma400_regmap_config;
 
 int bma400_probe(struct device *dev, struct regmap *regmap, const char *name);
 
-int bma400_remove(struct device *dev);
+void bma400_remove(struct device *dev);
 
 #endif

diff --git a/drivers/iio/accel/bma400_core.c b/drivers/iio/accel/bma400_core.c
index 21520e022a2123ca06acc61f69246e1a2e1d7667..fd2647b728d3d052f769e6e42c71d20cd8652015 100644 (file)
--- a/drivers/iio/accel/bma400_core.c
+++ b/drivers/iio/accel/bma400_core.c
@@ -828,7 +828,7 @@ int bma400_probe(struct device *dev, struct regmap *regmap, const char *name)
 }
 EXPORT_SYMBOL(bma400_probe);
 
-int bma400_remove(struct device *dev)
+void bma400_remove(struct device *dev)
 {
        struct iio_dev *indio_dev = dev_get_drvdata(dev);
        struct bma400_data *data = iio_priv(indio_dev);
@@ -838,12 +838,13 @@ int bma400_remove(struct device *dev)
        ret = bma400_set_power_mode(data, POWER_MODE_SLEEP);
        mutex_unlock(&data->mutex);
 
+       if (ret)
+               dev_warn(dev, "Failed to put device into sleep mode (%pe)\n", ERR_PTR(ret));
+
        regulator_bulk_disable(ARRAY_SIZE(data->regulators),
                               data->regulators);
 
        iio_device_unregister(indio_dev);
-
-       return ret;
 }
 EXPORT_SYMBOL(bma400_remove);
 

diff --git a/drivers/iio/accel/bma400_i2c.c b/drivers/iio/accel/bma400_i2c.c
index 9dcb7cc9996ea5e164453bb0d6ccd433c6f3f000..f50df5310bebf5c6e8a94cf7280d6ca9819af111 100644 (file)
--- a/drivers/iio/accel/bma400_i2c.c
+++ b/drivers/iio/accel/bma400_i2c.c
@@ -29,7 +29,9 @@ static int bma400_i2c_probe(struct i2c_client *client,
 
 static int bma400_i2c_remove(struct i2c_client *client)
 {
-       return bma400_remove(&client->dev);
+       bma400_remove(&client->dev);
+
+       return 0;
 }
 
 static const struct i2c_device_id bma400_i2c_ids[] = {

diff --git a/drivers/iio/accel/bma400_spi.c b/drivers/iio/accel/bma400_spi.c
index 7c2825904e0832c0e2afd954667fd5420fef550b..9f622e37477b4a22da9321f3539086082675066b 100644 (file)
--- a/drivers/iio/accel/bma400_spi.c
+++ b/drivers/iio/accel/bma400_spi.c
@@ -89,7 +89,9 @@ static int bma400_spi_probe(struct spi_device *spi)
 
 static int bma400_spi_remove(struct spi_device *spi)
 {
-       return bma400_remove(&spi->dev);
+       bma400_remove(&spi->dev);
+
+       return 0;
 }
 
 static const struct spi_device_id bma400_spi_ids[] = {