| Message ID | 20220514130432.304674-1-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | io:health:afe4404: Remove duplicated error reporting in .remove() | expand |
On Sat, 14 May 2022 15:04:32 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > 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. > > As afe4404_remove() 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> Applied. Like the others this will sit in testing until I can rebase the togreg branch. Thanks, Jonathan > --- > Hello, > > this is similar to the patches I sent recently. > (https://lore.kernel.org/linux-iio/20220430081607.15078-1-u.kleine-koenig@pengutronix.de/) > Just missed this driver when I intended to address this problem type for > all of drivers/iio/. > > Best regards > Uwe > > drivers/iio/health/afe4404.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/iio/health/afe4404.c b/drivers/iio/health/afe4404.c > index aa9311e1e655..1bb7de60f8ca 100644 > --- a/drivers/iio/health/afe4404.c > +++ b/drivers/iio/health/afe4404.c > @@ -591,10 +591,8 @@ static int afe4404_remove(struct i2c_client *client) > iio_trigger_unregister(afe->trig); > > ret = regulator_disable(afe->regulator); > - if (ret) { > + if (ret) > dev_err(afe->dev, "Unable to disable regulator\n"); > - return ret; > - } > > return 0; > } > > base-commit: 3123109284176b1532874591f7c81f3837bbdc17
Hello Jonathan, On Sat, May 14, 2022 at 02:38:12PM +0100, Jonathan Cameron wrote: > On Sat, 14 May 2022 15:04:32 +0200 > Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > > > 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. > > > > As afe4404_remove() 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> > Applied. > > Like the others this will sit in testing until I can rebase the togreg > branch. Don't know if it's to late to fix already, but I just noticed we'd want s/io/iio/ in the Subject line. Best regards Uwe
On Sun, 22 May 2022 21:58:42 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > Hello Jonathan, > > On Sat, May 14, 2022 at 02:38:12PM +0100, Jonathan Cameron wrote: > > On Sat, 14 May 2022 15:04:32 +0200 > > Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > > > > > 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. > > > > > > As afe4404_remove() 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> > > Applied. > > > > Like the others this will sit in testing until I can rebase the togreg > > branch. > > Don't know if it's to late to fix already, but I just noticed we'd want > s/io/iio/ in the Subject line. Good spot. Fixed up as haven't pushed the tree out as non rebasing yet (I'm waiting as I normally rebase on rc1). Jonathan > > Best regards > Uwe >
On Fri, 3 Jun 2022 16:16:38 +0100 Jonathan Cameron <jic23@kernel.org> wrote: > On Sun, 22 May 2022 21:58:42 +0200 > Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > > > Hello Jonathan, > > > > On Sat, May 14, 2022 at 02:38:12PM +0100, Jonathan Cameron wrote: > > > On Sat, 14 May 2022 15:04:32 +0200 > > > Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > > > > > > > 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. > > > > > > > > As afe4404_remove() 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> > > > Applied. > > > > > > Like the others this will sit in testing until I can rebase the togreg > > > branch. > > > > Don't know if it's to late to fix already, but I just noticed we'd want > > s/io/iio/ in the Subject line. > Good spot. Fixed up as haven't pushed the tree out as non rebasing yet > (I'm waiting as I normally rebase on rc1). > Might get delayed a little longer than that as I've just seen Greg has sent a late pull request for char-misc (unrelated to the IIO changes), so might need to wait a little past rc1. Jonathan > Jonathan > > > > > Best regards > > Uwe > > >
diff --git a/drivers/iio/health/afe4404.c b/drivers/iio/health/afe4404.c index aa9311e1e655..1bb7de60f8ca 100644 --- a/drivers/iio/health/afe4404.c +++ b/drivers/iio/health/afe4404.c @@ -591,10 +591,8 @@ static int afe4404_remove(struct i2c_client *client) iio_trigger_unregister(afe->trig); ret = regulator_disable(afe->regulator); - if (ret) { + if (ret) dev_err(afe->dev, "Unable to disable regulator\n"); - return ret; - } return 0; }
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. As afe4404_remove() 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> --- Hello, this is similar to the patches I sent recently. (https://lore.kernel.org/linux-iio/20220430081607.15078-1-u.kleine-koenig@pengutronix.de/) Just missed this driver when I intended to address this problem type for all of drivers/iio/. Best regards Uwe drivers/iio/health/afe4404.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) base-commit: 3123109284176b1532874591f7c81f3837bbdc17