| Message ID | 20220515161227.339514-2-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] leds: lp50xx: Remove duplicated error reporting in .remove() | expand |
Hello Pavel, On Sun, May 15, 2022 at 06:12:27PM +0200, Uwe Kleine-König wrote: > Returning an error value from an i2c remove callback results in an 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. > > As lm3697_remove() already emits an error message on failure and the > additional error message by the i2c core doesn't add any useful > information, don't pass the error value up the stack. Instead continue > to clean up and return 0. > > This patch is a preparation for making i2c remove callbacks return void. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> you merged patch 1 of this series (which is in Linus Torvald's tree now). But you neither commented nor merged this patch. I assume you just missed this one? Best regards Uwe
Hello Pavel, On Wed, Jun 01, 2022 at 11:35:37AM +0200, Uwe Kleine-König wrote: > On Sun, May 15, 2022 at 06:12:27PM +0200, Uwe Kleine-König wrote: > > Returning an error value from an i2c remove callback results in an 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. > > > > As lm3697_remove() already emits an error message on failure and the > > additional error message by the i2c core doesn't add any useful > > information, don't pass the error value up the stack. Instead continue > > to clean up and return 0. > > > > This patch is a preparation for making i2c remove callbacks return void. > > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > you merged patch 1 of this series (which is in Linus Torvald's tree > now). But you neither commented nor merged this patch. I assume you just > missed this one? Just a quick additional note: I want to tackle making i2c remove callbacks return void after the next merge window and this is a preparing patch for that. So it would be great if that patch made it in in the post 5.19 merge window. Otherwise I'll send this patch together with the callback change to get accepted via the i2c tree. See https://lore.kernel.org/linux-i2c/20220609091018.q52fhowlsdbdkct5@pengutronix.de/ for some more details. Best regards Uwe
diff --git a/drivers/leds/leds-lm3697.c b/drivers/leds/leds-lm3697.c index a8c9322558cc..3ecf90fbc06c 100644 --- a/drivers/leds/leds-lm3697.c +++ b/drivers/leds/leds-lm3697.c @@ -345,10 +345,8 @@ static int lm3697_remove(struct i2c_client *client) ret = regmap_update_bits(led->regmap, LM3697_CTRL_ENABLE, LM3697_CTRL_A_B_EN, 0); - if (ret) { + if (ret) dev_err(dev, "Failed to disable the device\n"); - return ret; - } if (led->enable_gpio) gpiod_direction_output(led->enable_gpio, 0);
Returning an error value from an i2c remove callback results in an 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. As lm3697_remove() already emits an error message on failure and the additional error message by the i2c core doesn't add any useful information, don't pass the error value up the stack. Instead continue to clean up and return 0. 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/leds/leds-lm3697.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)