Skip to content

Commit ade0642

Browse files
Uwe Kleine-KönigLee Jones
authored andcommitted
mfd: rt4831: 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. Signed-off-by: Uwe Kleine-König <[email protected]> Signed-off-by: Lee Jones <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 311242c commit ade0642

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/mfd/rt4831.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,14 @@ static int rt4831_probe(struct i2c_client *client)
9090
static int rt4831_remove(struct i2c_client *client)
9191
{
9292
struct regmap *regmap = dev_get_regmap(&client->dev, NULL);
93+
int ret;
9394

9495
/* Disable WLED and DSV outputs */
95-
return regmap_update_bits(regmap, RT4831_REG_ENABLE, RT4831_RESET_MASK, RT4831_RESET_MASK);
96+
ret = regmap_update_bits(regmap, RT4831_REG_ENABLE, RT4831_RESET_MASK, RT4831_RESET_MASK);
97+
if (ret)
98+
dev_warn(&client->dev, "Failed to disable outputs (%pe)\n", ERR_PTR(ret));
99+
100+
return 0;
96101
}
97102

98103
static const struct of_device_id __maybe_unused rt4831_of_match[] = {

0 commit comments

Comments
 (0)