public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Uwe Kleine-König 2021-11-16 12:09:51 +01:00 • committed by Mark Brown
parent fa55b7dcdc
commit 4950486cd8
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/regulator/da9121-regulator.c
View file

@ -1065,7 +1065,7 @@ static int da9121_i2c_remove(struct i2c_client *i2c)
{ {
struct da9121 *chip = i2c_get_clientdata(i2c); struct da9121 *chip = i2c_get_clientdata(i2c);
const int mask_all[4] = { 0xFF, 0xFF, 0xFF, 0xFF }; const int mask_all[4] = { 0xFF, 0xFF, 0xFF, 0xFF };
int ret = 0; int ret;
free_irq(chip->chip_irq, chip); free_irq(chip->chip_irq, chip);
cancel_delayed_work_sync(&chip->work); 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); ret = regmap_bulk_write(chip->regmap, DA9121_REG_SYS_MASK_0, mask_all, 4);
if (ret != 0) if (ret != 0)
dev_err(chip->dev, "Failed to set IRQ masks: %d\n", ret); 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[] = { static const struct i2c_device_id da9121_i2c_id[] = {