Unverified Commit 4950486c authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown
Browse files

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: default avatarUwe 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: default avatarMark Brown <broonie@kernel.org>
parent fa55b7dc

drivers/regulator/da9121-regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -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[] = {