Commit 516c1514 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

regulator: da9211: Remove unnecessary devm_regulator_unregister() calls

Current code uses devm_regulator_register(), so the resource management code
will ensure that the resource is freed.
Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 1028a37d
...@@ -245,7 +245,7 @@ static int da9211_regulator_init(struct da9211 *chip) ...@@ -245,7 +245,7 @@ static int da9211_regulator_init(struct da9211 *chip)
ret = regmap_read(chip->regmap, DA9211_REG_CONFIG_E, &data); ret = regmap_read(chip->regmap, DA9211_REG_CONFIG_E, &data);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, "Failed to read CONTROL_E reg: %d\n", ret); dev_err(chip->dev, "Failed to read CONTROL_E reg: %d\n", ret);
goto err; return ret;
} }
data &= DA9211_SLAVE_SEL; data &= DA9211_SLAVE_SEL;
...@@ -259,9 +259,8 @@ static int da9211_regulator_init(struct da9211 *chip) ...@@ -259,9 +259,8 @@ static int da9211_regulator_init(struct da9211 *chip)
else else
chip->num_regulator = 2; chip->num_regulator = 2;
} else { } else {
ret = -EINVAL;
dev_err(chip->dev, "Configuration is mismatched\n"); dev_err(chip->dev, "Configuration is mismatched\n");
goto err; return -EINVAL;
} }
for (i = 0; i < chip->num_regulator; i++) { for (i = 0; i < chip->num_regulator; i++) {
...@@ -278,8 +277,7 @@ static int da9211_regulator_init(struct da9211 *chip) ...@@ -278,8 +277,7 @@ static int da9211_regulator_init(struct da9211 *chip)
if (IS_ERR(chip->rdev[i])) { if (IS_ERR(chip->rdev[i])) {
dev_err(chip->dev, dev_err(chip->dev,
"Failed to register DA9211 regulator\n"); "Failed to register DA9211 regulator\n");
ret = PTR_ERR(chip->rdev[i]); return PTR_ERR(chip->rdev[i]);
goto err_regulator;
} }
if (chip->chip_irq != 0) { if (chip->chip_irq != 0) {
...@@ -288,18 +286,12 @@ static int da9211_regulator_init(struct da9211 *chip) ...@@ -288,18 +286,12 @@ static int da9211_regulator_init(struct da9211 *chip)
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, dev_err(chip->dev,
"Failed to update mask reg: %d\n", ret); "Failed to update mask reg: %d\n", ret);
goto err_regulator; return ret;
} }
} }
} }
return 0; return 0;
err_regulator:
while (--i >= 0)
devm_regulator_unregister(chip->dev, chip->rdev[i]);
err:
return ret;
} }
/* /*
* I2C driver interface functions * I2C driver interface functions
...@@ -353,17 +345,6 @@ static int da9211_i2c_probe(struct i2c_client *i2c, ...@@ -353,17 +345,6 @@ static int da9211_i2c_probe(struct i2c_client *i2c,
return ret; return ret;
} }
static int da9211_i2c_remove(struct i2c_client *i2c)
{
struct da9211 *chip = i2c_get_clientdata(i2c);
int i;
for (i = 0; i < chip->num_regulator; i++)
devm_regulator_unregister(chip->dev, chip->rdev[i]);
return 0;
}
static const struct i2c_device_id da9211_i2c_id[] = { static const struct i2c_device_id da9211_i2c_id[] = {
{"da9211", 0}, {"da9211", 0},
{}, {},
...@@ -377,7 +358,6 @@ static struct i2c_driver da9211_regulator_driver = { ...@@ -377,7 +358,6 @@ static struct i2c_driver da9211_regulator_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = da9211_i2c_probe, .probe = da9211_i2c_probe,
.remove = da9211_i2c_remove,
.id_table = da9211_i2c_id, .id_table = da9211_i2c_id,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment