diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2022-08-15 10:02:28 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2022-08-16 12:34:04 +0200 |
| commit | 22a23436891886a66d21af3619f4a4e8809f0e0a (patch) | |
| tree | e46f721f51346f518d471aad33ec90c4a43f30b6 /drivers/leds | |
| parent | 32f7eed0c763a9b89f6b357ec54b48398fc7b99e (diff) | |
| download | linux-stable-22a23436891886a66d21af3619f4a4e8809f0e0a.tar.gz linux-stable-22a23436891886a66d21af3619f4a4e8809f0e0a.tar.bz2 linux-stable-22a23436891886a66d21af3619f4a4e8809f0e0a.zip | |
leds: lm3601x: 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.
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>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/flash/leds-lm3601x.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/leds/flash/leds-lm3601x.c b/drivers/leds/flash/leds-lm3601x.c index 3d1272748201..37e1d6e68687 100644 --- a/drivers/leds/flash/leds-lm3601x.c +++ b/drivers/leds/flash/leds-lm3601x.c @@ -443,10 +443,15 @@ static int lm3601x_probe(struct i2c_client *client) static int lm3601x_remove(struct i2c_client *client) { struct lm3601x_led *led = i2c_get_clientdata(client); + int ret; - return regmap_update_bits(led->regmap, LM3601X_ENABLE_REG, - LM3601X_ENABLE_MASK, - LM3601X_MODE_STANDBY); + ret = regmap_update_bits(led->regmap, LM3601X_ENABLE_REG, + LM3601X_ENABLE_MASK, LM3601X_MODE_STANDBY); + if (ret) + dev_warn(&client->dev, + "Failed to put into standby (%pe)\n", ERR_PTR(ret)); + + return 0; } static const struct i2c_device_id lm3601x_id[] = { |