aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2022-04-30 10:15:59 +0200
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2022-06-11 14:35:25 +0100
commitaae59bdf2585dafffc0bf71af729fe641fc2a771 (patch)
treeeb700b23c0c789cb7277d9f63a8a50444a52cd79
parentiio: proximity: srf04: Make use of device properties (diff)
downloadlinux-dev-aae59bdf2585dafffc0bf71af729fe641fc2a771.tar.xz
linux-dev-aae59bdf2585dafffc0bf71af729fe641fc2a771.zip
iio:accel:mc3230: Remove duplicated error reporting in .remove()
Returning an error value in an i2c remove callback results in an error message being emitted by the i2c core, but otherwise it doesn't make a difference. The device goes away anyhow and the devm cleanups are called. As mc3230_set_opcon() already emits an error message on failure and the additional error message by the i2c core doesn't add any useful information, change the return value to zero to suppress this message. This patch is a preparation for making i2c remove callbacks return void. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20220430081607.15078-2-u.kleine-koenig@pengutronix.de Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-rw-r--r--drivers/iio/accel/mc3230.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
index 679e69cd7657..c15d16e7f1da 100644
--- a/drivers/iio/accel/mc3230.c
+++ b/drivers/iio/accel/mc3230.c
@@ -157,7 +157,9 @@ static int mc3230_remove(struct i2c_client *client)
iio_device_unregister(indio_dev);
- return mc3230_set_opcon(iio_priv(indio_dev), MC3230_MODE_OPCON_STANDBY);
+ mc3230_set_opcon(iio_priv(indio_dev), MC3230_MODE_OPCON_STANDBY);
+
+ return 0;
}
static int mc3230_suspend(struct device *dev)