Commit fa0b148e authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Jonathan Cameron

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarAlexandru Ardelean <ardeleanalex@gmail.com>
Link: https://lore.kernel.org/r/20211013203223.2694577-2-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 885b9790
...@@ -94,6 +94,6 @@ extern const struct regmap_config bma400_regmap_config; ...@@ -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_probe(struct device *dev, struct regmap *regmap, const char *name);
int bma400_remove(struct device *dev); void bma400_remove(struct device *dev);
#endif #endif
...@@ -828,7 +828,7 @@ int bma400_probe(struct device *dev, struct regmap *regmap, const char *name) ...@@ -828,7 +828,7 @@ int bma400_probe(struct device *dev, struct regmap *regmap, const char *name)
} }
EXPORT_SYMBOL(bma400_probe); 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 iio_dev *indio_dev = dev_get_drvdata(dev);
struct bma400_data *data = iio_priv(indio_dev); struct bma400_data *data = iio_priv(indio_dev);
...@@ -838,12 +838,13 @@ int bma400_remove(struct device *dev) ...@@ -838,12 +838,13 @@ int bma400_remove(struct device *dev)
ret = bma400_set_power_mode(data, POWER_MODE_SLEEP); ret = bma400_set_power_mode(data, POWER_MODE_SLEEP);
mutex_unlock(&data->mutex); 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), regulator_bulk_disable(ARRAY_SIZE(data->regulators),
data->regulators); data->regulators);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
return ret;
} }
EXPORT_SYMBOL(bma400_remove); EXPORT_SYMBOL(bma400_remove);
......
...@@ -29,7 +29,9 @@ static int bma400_i2c_probe(struct i2c_client *client, ...@@ -29,7 +29,9 @@ static int bma400_i2c_probe(struct i2c_client *client,
static int bma400_i2c_remove(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[] = { static const struct i2c_device_id bma400_i2c_ids[] = {
......
...@@ -89,7 +89,9 @@ static int bma400_spi_probe(struct spi_device *spi) ...@@ -89,7 +89,9 @@ static int bma400_spi_probe(struct spi_device *spi)
static int bma400_spi_remove(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[] = { static const struct spi_device_id bma400_spi_ids[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment