]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
leds: lp50xx: Remove duplicated error reporting in .remove()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 5 Jan 2026 16:48:07 +0000 (11:48 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Jan 2026 12:12:07 +0000 (13:12 +0100)
[ Upstream commit 73bce575ed90c752eaa4b2b9a70860481d58d240 ]

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 stk3310_set_state() 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>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Stable-dep-of: 434959618c47 ("leds: leds-lp50xx: Enable chip before any communication")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/leds/leds-lp50xx.c

index 918cd69cfbf6c72b1fee1c947808279d5db334fb..1eb21d603b8eff813b9e7ac6c897ec6634aaf46e 100644 (file)
@@ -582,10 +582,8 @@ static int lp50xx_remove(struct i2c_client *client)
        int ret;
 
        ret = lp50xx_enable_disable(led, 0);
-       if (ret) {
+       if (ret)
                dev_err(led->dev, "Failed to disable chip\n");
-               return ret;
-       }
 
        if (led->regulator) {
                ret = regulator_disable(led->regulator);