hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

regulator: lp872x: Remove **regulators from struct lp872x 

Current code is using devm_regulator_register(), so we don't need to store *rdev
in struct lp872x for clean up.
Also clean up lp872x_probe() a bit to remove unnecessary goto and num_regulators
variable.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Axel Lin 2015-01-26 10:25:13 +08:00 committed by Mark Brown
parent 97bf6af1f9
commit 8538c4075e
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/regulator/lp872x.c
View File

@ -106,7 +106,6 @@ struct lp872x {
struct device *dev; struct device *dev;
enum lp872x_id chipid; enum lp872x_id chipid;
struct lp872x_platform_data *pdata; struct lp872x_platform_data *pdata;
struct regulator_dev **regulators;
int num_regulators; int num_regulators;
enum lp872x_dvs_state dvs_pin; enum lp872x_dvs_state dvs_pin;
int dvs_gpio; int dvs_gpio;
@ -801,8 +800,6 @@ static int lp872x_regulator_register(struct lp872x *lp)
dev_err(lp->dev, "regulator register err"); dev_err(lp->dev, "regulator register err");
return PTR_ERR(rdev); return PTR_ERR(rdev);
} }
*(lp->regulators + i) = rdev;
} }
return 0; return 0;
@ -906,7 +903,7 @@ static struct lp872x_platform_data
static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id) static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
{ {
struct lp872x *lp; struct lp872x *lp;
int ret, size, num_regulators; int ret;
const int lp872x_num_regulators[] = { const int lp872x_num_regulators[] = {
[LP8720] = LP8720_NUM_REGULATORS, [LP8720] = LP8720_NUM_REGULATORS,
[LP8725] = LP8725_NUM_REGULATORS, [LP8725] = LP8725_NUM_REGULATORS,
@ -918,38 +915,27 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
lp = devm_kzalloc(&cl->dev, sizeof(struct lp872x), GFP_KERNEL); lp = devm_kzalloc(&cl->dev, sizeof(struct lp872x), GFP_KERNEL);
if (!lp) if (!lp)
goto err_mem; return -ENOMEM;
num_regulators = lp872x_num_regulators[id->driver_data]; lp->num_regulators = lp872x_num_regulators[id->driver_data];
size = sizeof(struct regulator_dev *) * num_regulators;
lp->regulators = devm_kzalloc(&cl->dev, size, GFP_KERNEL);
if (!lp->regulators)
goto err_mem;
lp->regmap = devm_regmap_init_i2c(cl, &lp872x_regmap_config); lp->regmap = devm_regmap_init_i2c(cl, &lp872x_regmap_config);
if (IS_ERR(lp->regmap)) { if (IS_ERR(lp->regmap)) {
ret = PTR_ERR(lp->regmap); ret = PTR_ERR(lp->regmap);
dev_err(&cl->dev, "regmap init i2c err: %d\n", ret); dev_err(&cl->dev, "regmap init i2c err: %d\n", ret);
goto err_dev; return ret;
} }
lp->dev = &cl->dev; lp->dev = &cl->dev;
lp->pdata = dev_get_platdata(&cl->dev); lp->pdata = dev_get_platdata(&cl->dev);
lp->chipid = id->driver_data; lp->chipid = id->driver_data;
lp->num_regulators = num_regulators;
i2c_set_clientdata(cl, lp); i2c_set_clientdata(cl, lp);
ret = lp872x_config(lp); ret = lp872x_config(lp);
if (ret) if (ret)
goto err_dev; return ret;
return lp872x_regulator_register(lp); return lp872x_regulator_register(lp);
err_mem:
return -ENOMEM;
err_dev:
return ret;
} }
static const struct of_device_id lp872x_dt_ids[] = { static const struct of_device_id lp872x_dt_ids[] = {