diff mbox series

[8/8] iio:light:vcnl4035: Improve error reporting for problems during .remove()

Message ID 20220515155929.338656-9-u.kleine-koenig@pengutronix.de (mailing list archive)
State Accepted
Headers show
Series iio: Improve error reporting for problems during .remove for various i2c drivers | expand

Commit Message

Uwe Kleine-König May 15, 2022, 3:59 p.m. UTC
Returning an error value in an i2c remove callback results in a generic
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

So instead of triggering the generic i2c error message, emit a more
helpful message if a problem occurs and return 0 to suppress the generic

This patch is a preparation for making i2c remove callbacks return void.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 drivers/iio/light/vcnl4035.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
diff mbox series


diff --git a/drivers/iio/light/vcnl4035.c b/drivers/iio/light/vcnl4035.c
index da2bf622a67b..2aaec6bef64c 100644
--- a/drivers/iio/light/vcnl4035.c
+++ b/drivers/iio/light/vcnl4035.c
@@ -604,14 +604,20 @@  static int vcnl4035_probe(struct i2c_client *client,
 static int vcnl4035_remove(struct i2c_client *client)
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
+	int ret;
-	return vcnl4035_set_als_power_state(iio_priv(indio_dev),
+	ret = vcnl4035_set_als_power_state(iio_priv(indio_dev),
+					   VCNL4035_MODE_ALS_DISABLE);
+	if (ret)
+		dev_warn(&client->dev, "Failed to put device into standby (%pe)\n",
+			 ERR_PTR(ret));
+	return 0;
 static int __maybe_unused vcnl4035_runtime_suspend(struct device *dev)