Skip to content

Commit

Permalink
leds: lm3697: Remove duplicated error reporting in .remove()
Browse files Browse the repository at this point in the history
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.

Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
  • Loading branch information
Uwe Kleine-König authored and Wolfram Sang committed Aug 16, 2022
1 parent eb09882 commit af89fa1
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/leds/leds-lm3697.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit af89fa1

Please sign in to comment.