summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2022-05-15 17:59:22 +0200
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2022-06-11 14:35:27 +0100
commitffa952e95d8c56cd1e06bc21e3b0baf8d212fef8 (patch)
tree94b5f03efd884cdd52bcbf8bb007a3dc0a502b1b /drivers
parent78f32011b24021bb96accc2a57791ce727cc166a (diff)
downloadlinux-stable-ffa952e95d8c56cd1e06bc21e3b0baf8d212fef8.tar.gz
linux-stable-ffa952e95d8c56cd1e06bc21e3b0baf8d212fef8.tar.bz2
linux-stable-ffa952e95d8c56cd1e06bc21e3b0baf8d212fef8.zip
iio:adc:ina2xx: 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-2-u.kleine-koenig@pengutronix.de Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/iio/adc/ina2xx-adc.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/iio/adc/ina2xx-adc.c b/drivers/iio/adc/ina2xx-adc.c
index abad16803849..240e6c420701 100644
--- a/drivers/iio/adc/ina2xx-adc.c
+++ b/drivers/iio/adc/ina2xx-adc.c
@@ -1038,12 +1038,18 @@ static int ina2xx_remove(struct i2c_client *client)
{
struct iio_dev *indio_dev = i2c_get_clientdata(client);
struct ina2xx_chip_info *chip = iio_priv(indio_dev);
+ int ret;
iio_device_unregister(indio_dev);
/* Powerdown */
- return regmap_update_bits(chip->regmap, INA2XX_CONFIG,
- INA2XX_MODE_MASK, 0);
+ ret = regmap_update_bits(chip->regmap, INA2XX_CONFIG,
+ INA2XX_MODE_MASK, 0);
+ if (ret)
+ dev_warn(&client->dev, "Failed to power down device (%pe)\n",
+ ERR_PTR(ret));
+
+ return 0;
}
static const struct i2c_device_id ina2xx_id[] = {