| Message ID | 20211025195007.84541-1-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: accel: mma7660: Warn about failure to put device in stand-by in .remove() | expand |
On Mon, 25 Oct 2021 21:50:07 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > Whan an i2c 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. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Applied to the togreg branch of iio.git. Note this will be a next cycle thing now as we are too close to the merge window. Thanks, Jonathan > --- > drivers/iio/accel/mma7660.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/iio/accel/mma7660.c b/drivers/iio/accel/mma7660.c > index 47f5cd66e996..78c20618fdc3 100644 > --- a/drivers/iio/accel/mma7660.c > +++ b/drivers/iio/accel/mma7660.c > @@ -210,10 +210,16 @@ static int mma7660_probe(struct i2c_client *client, > static int mma7660_remove(struct i2c_client *client) > { > struct iio_dev *indio_dev = i2c_get_clientdata(client); > + int ret; > > iio_device_unregister(indio_dev); > > - return mma7660_set_mode(iio_priv(indio_dev), MMA7660_MODE_STANDBY); > + ret = mma7660_set_mode(iio_priv(indio_dev), MMA7660_MODE_STANDBY); > + if (ret) > + dev_warn(&client->dev, "Failed to put device in stand-by mode (%pe), ignoring\n", > + ERR_PTR(ret)); > + > + return 0; > } > > #ifdef CONFIG_PM_SLEEP
diff --git a/drivers/iio/accel/mma7660.c b/drivers/iio/accel/mma7660.c index 47f5cd66e996..78c20618fdc3 100644 --- a/drivers/iio/accel/mma7660.c +++ b/drivers/iio/accel/mma7660.c @@ -210,10 +210,16 @@ static int mma7660_probe(struct i2c_client *client, static int mma7660_remove(struct i2c_client *client) { struct iio_dev *indio_dev = i2c_get_clientdata(client); + int ret; iio_device_unregister(indio_dev); - return mma7660_set_mode(iio_priv(indio_dev), MMA7660_MODE_STANDBY); + ret = mma7660_set_mode(iio_priv(indio_dev), MMA7660_MODE_STANDBY); + if (ret) + dev_warn(&client->dev, "Failed to put device in stand-by mode (%pe), ignoring\n", + ERR_PTR(ret)); + + return 0; } #ifdef CONFIG_PM_SLEEP
Whan an i2c 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. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/iio/accel/mma7660.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)