diff options
-rw-r--r-- | drivers/regulator/db8500-prcmu.c | 10 | ||||
-rw-r--r-- | drivers/regulator/dbx500-prcmu.h | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/drivers/regulator/db8500-prcmu.c b/drivers/regulator/db8500-prcmu.c index c2a3ccfc510e..eb317663f875 100644 --- a/drivers/regulator/db8500-prcmu.c +++ b/drivers/regulator/db8500-prcmu.c @@ -439,6 +439,7 @@ static int db8500_regulator_probe(struct platform_device *pdev) struct regulator_init_data *db8500_init_data; struct dbx500_regulator_info *info; struct regulator_config config = { }; + struct regulator_dev *rdev; int err, i; db8500_init_data = dev_get_platdata(&pdev->dev); @@ -446,17 +447,16 @@ static int db8500_regulator_probe(struct platform_device *pdev) for (i = 0; i < ARRAY_SIZE(dbx500_regulator_info); i++) { /* assign per-regulator data */ info = &dbx500_regulator_info[i]; - info->dev = &pdev->dev; config.driver_data = info; config.dev = &pdev->dev; if (db8500_init_data) config.init_data = &db8500_init_data[i]; - info->rdev = devm_regulator_register(&pdev->dev, &info->desc, - &config); - if (IS_ERR(info->rdev)) { - err = PTR_ERR(info->rdev); + rdev = devm_regulator_register(&pdev->dev, &info->desc, + &config); + if (IS_ERR(rdev)) { + err = PTR_ERR(rdev); dev_err(&pdev->dev, "failed to register %s: err %i\n", info->desc.name, err); return err; diff --git a/drivers/regulator/dbx500-prcmu.h b/drivers/regulator/dbx500-prcmu.h index c8e51ace9f06..6e20dab611ac 100644 --- a/drivers/regulator/dbx500-prcmu.h +++ b/drivers/regulator/dbx500-prcmu.h @@ -15,18 +15,14 @@ /** * struct dbx500_regulator_info - dbx500 regulator information - * @dev: device pointer * @desc: regulator description - * @rdev: regulator device pointer * @is_enabled: status of the regulator * @epod_id: id for EPOD (power domain) * @is_ramret: RAM retention switch for EPOD (power domain) * */ struct dbx500_regulator_info { - struct device *dev; struct regulator_desc desc; - struct regulator_dev *rdev; bool is_enabled; u16 epod_id; bool is_ramret; |