regulator: da9121: Emit only one error message in .remove()

When an i2c remove callback fails, the i2c core emits a generic error
message and still removes the device. Apart from the message there the
return value isn't further used.

So don't return an error code after having already emitted a driver
specific warning about the problem to prevent two messages about the
same issue.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20211116110951.1213566-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/da9121-regulator.c b/drivers/regulator/da9121-regulator.c
index e66925090258021f75ebd1c994efccaa492f3282..a5a83b772a854f2197c7547cbf4b97da661d9259 100644 (file)
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -1065,7 +1065,7 @@ static int da9121_i2c_remove(struct i2c_client *i2c)
 {
        struct da9121 *chip = i2c_get_clientdata(i2c);
        const int mask_all[4] = { 0xFF, 0xFF, 0xFF, 0xFF };
-       int ret = 0;
+       int ret;
 
        free_irq(chip->chip_irq, chip);
        cancel_delayed_work_sync(&chip->work);
@@ -1073,7 +1073,7 @@ static int da9121_i2c_remove(struct i2c_client *i2c)
        ret = regmap_bulk_write(chip->regmap, DA9121_REG_SYS_MASK_0, mask_all, 4);
        if (ret != 0)
                dev_err(chip->dev, "Failed to set IRQ masks: %d\n", ret);
-       return ret;
+       return 0;
 }
 
 static const struct i2c_device_id da9121_i2c_id[] = {