leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

regulator: pfuze100: use devm_regulator_register()

Browse Source 
Use devm_regulator_register() to make cleanup paths simpler,
and remove unnecessary remove().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Robin Gong <b38343@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Jingoo Han 2013-12-06 16:11:58 +09:00 committed by Mark Brown
parent 6ce4eac1f6
commit f5247b401c
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/regulator/pfuze100-regulator.c
View File

@ -402,31 +402,18 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
config.driver_data = pfuze_chip; config.driver_data = pfuze_chip;
config.of_node = match_of_node(i); config.of_node = match_of_node(i);
pfuze_chip->regulators[i] = regulator_register(desc, &config); pfuze_chip->regulators[i] =
devm_regulator_register(&client->dev, desc, &config);
if (IS_ERR(pfuze_chip->regulators[i])) { if (IS_ERR(pfuze_chip->regulators[i])) {
dev_err(&client->dev, "register regulator%s failed\n", dev_err(&client->dev, "register regulator%s failed\n",
pfuze100_regulators[i].desc.name); pfuze100_regulators[i].desc.name);
ret = PTR_ERR(pfuze_chip->regulators[i]); return PTR_ERR(pfuze_chip->regulators[i]);
while (--i >= 0)
regulator_unregister(pfuze_chip->regulators[i]);
return ret;
} }
} }
return 0; return 0;
} }
static int pfuze100_regulator_remove(struct i2c_client *client)
{
int i;
struct pfuze_chip *pfuze_chip = i2c_get_clientdata(client);
for (i = 0; i < PFUZE100_MAX_REGULATOR; i++)
regulator_unregister(pfuze_chip->regulators[i]);
return 0;
}
static struct i2c_driver pfuze_driver = { static struct i2c_driver pfuze_driver = {
.id_table = pfuze_device_id, .id_table = pfuze_device_id,
.driver = { .driver = {
@ -435,7 +422,6 @@ static struct i2c_driver pfuze_driver = {
.of_match_table = pfuze_dt_ids, .of_match_table = pfuze_dt_ids,
}, },
.probe = pfuze100_regulator_probe, .probe = pfuze100_regulator_probe,
.remove = pfuze100_regulator_remove,
}; };
module_i2c_driver(pfuze_driver); module_i2c_driver(pfuze_driver);