diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2022-05-15 17:59:29 +0200 |
---|---|---|
committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2022-06-11 14:35:27 +0100 |
commit | 7576bc05b36025b875084a725276941125c576b4 (patch) | |
tree | 802dbf09538fcc7523c64936031dcfc5ac44c3cd /drivers/iio | |
parent | ab91da2f25746c2c30117d9ce93a7960ccd2f2cf (diff) | |
download | linux-stable-7576bc05b36025b875084a725276941125c576b4.tar.gz linux-stable-7576bc05b36025b875084a725276941125c576b4.tar.bz2 linux-stable-7576bc05b36025b875084a725276941125c576b4.zip |
iio:light:vcnl4035: Improve error reporting for problems during .remove()
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
called.
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
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/20220515155929.338656-9-u.kleine-koenig@pengutronix.de
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio')
-rw-r--r-- | drivers/iio/light/vcnl4035.c | 10 |
1 files changed, 8 insertions, 2 deletions
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 @@ fail_poweroff: static int vcnl4035_remove(struct i2c_client *client) { struct iio_dev *indio_dev = i2c_get_clientdata(client); + int ret; pm_runtime_dont_use_autosuspend(&client->dev); pm_runtime_disable(&client->dev); iio_device_unregister(indio_dev); pm_runtime_set_suspended(&client->dev); - return vcnl4035_set_als_power_state(iio_priv(indio_dev), - VCNL4035_MODE_ALS_DISABLE); + 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) |