openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

regulator: tps62360: Convert to devm_regmap_init_i2c() 

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2012-04-07 23:29:56 +08:00 committed by Mark Brown
parent dc553a7994
commit 9a4bdd87a2
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/regulator/tps62360-regulator.c
View File

@ -320,7 +320,7 @@ static int __devinit tps62360_probe(struct i2c_client *client,
tps->desc.ops = &tps62360_dcdc_ops; tps->desc.ops = &tps62360_dcdc_ops;
tps->desc.type = REGULATOR_VOLTAGE; tps->desc.type = REGULATOR_VOLTAGE;
tps->desc.owner = THIS_MODULE; tps->desc.owner = THIS_MODULE;
tps->regmap = regmap_init_i2c(client, &tps62360_regmap_config); tps->regmap = devm_regmap_init_i2c(client, &tps62360_regmap_config);
if (IS_ERR(tps->regmap)) { if (IS_ERR(tps->regmap)) {
ret = PTR_ERR(tps->regmap); ret = PTR_ERR(tps->regmap);
dev_err(&client->dev, "%s() Err: Failed to allocate register" dev_err(&client->dev, "%s() Err: Failed to allocate register"
@ -408,7 +408,6 @@ static int __devinit tps62360_probe(struct i2c_client *client,
if (gpio_is_valid(tps->vsel0_gpio)) if (gpio_is_valid(tps->vsel0_gpio))
gpio_free(tps->vsel0_gpio); gpio_free(tps->vsel0_gpio);
err_gpio0: err_gpio0:
regmap_exit(tps->regmap);
return ret; return ret;
} }
@ -429,7 +428,6 @@ static int __devexit tps62360_remove(struct i2c_client *client)
gpio_free(tps->vsel0_gpio); gpio_free(tps->vsel0_gpio);
regulator_unregister(tps->rdev); regulator_unregister(tps->rdev);
regmap_exit(tps->regmap);
return 0; return 0;
} }