1 files changed, 56 insertions, 53 deletions

diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index 05f11b96e17f..f75fb90d7db3 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -434,14 +434,14 @@ static int palmas_ldo_write(struct palmas *palmas, unsigned int reg,
 
 static int palmas_set_mode_smps(struct regulator_dev *dev, unsigned int mode)
 {
+        int id = rdev_get_id(dev);
         struct palmas_pmic *pmic = rdev_get_drvdata(dev);
         struct palmas_pmic_driver_data *ddata = pmic->palmas->pmic_ddata;
-        int id = rdev_get_id(dev);
+        struct palmas_regs_info *rinfo = &ddata->palmas_regs_info[id];
         unsigned int reg;
         bool rail_enable = true;
 
-        palmas_smps_read(pmic->palmas, ddata->palmas_regs_info[id].ctrl_addr,
-                         &reg);
+        palmas_smps_read(pmic->palmas, rinfo->ctrl_addr, &reg);
 
         reg &= ~PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;
 
@@ -464,8 +464,7 @@ static int palmas_set_mode_smps(struct regulator_dev *dev, unsigned int mode)
 
         pmic->current_reg_mode[id] = reg & PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;
         if (rail_enable)
-                palmas_smps_write(pmic->palmas,
-                                  ddata->palmas_regs_info[id].ctrl_addr, reg);
+                palmas_smps_write(pmic->palmas, rinfo->ctrl_addr, reg);
 
         /* Switch the enable value to ensure this is used for enable */
         pmic->desc[id].enable_val = pmic->current_reg_mode[id];
@@ -496,11 +495,11 @@ static unsigned int palmas_get_mode_smps(struct regulator_dev *dev)
 static int palmas_smps_set_ramp_delay(struct regulator_dev *rdev,
                  int ramp_delay)
 {
+        int id = rdev_get_id(rdev);
         struct palmas_pmic *pmic = rdev_get_drvdata(rdev);
         struct palmas_pmic_driver_data *ddata = pmic->palmas->pmic_ddata;
-        int id = rdev_get_id(rdev);
+        struct palmas_regs_info *rinfo = &ddata->palmas_regs_info[id];
         unsigned int reg = 0;
-        unsigned int addr = ddata->palmas_regs_info[id].tstep_addr;
         int ret;
 
         /* SMPS3 and SMPS7 do not have tstep_addr setting */
@@ -519,7 +518,7 @@ static int palmas_smps_set_ramp_delay(struct regulator_dev *rdev,
         else
                 reg = 1;
 
-        ret = palmas_smps_write(pmic->palmas, addr, reg);
+        ret = palmas_smps_write(pmic->palmas, rinfo->tstep_addr, reg);
         if (ret < 0) {
                 dev_err(pmic->palmas->dev, "TSTEP write failed: %d\n", ret);
                 return ret;
@@ -590,13 +589,13 @@ static struct regulator_ops tps65917_ops_ext_control_smps = {
 
 static int palmas_is_enabled_ldo(struct regulator_dev *dev)
 {
+        int id = rdev_get_id(dev);
         struct palmas_pmic *pmic = rdev_get_drvdata(dev);
         struct palmas_pmic_driver_data *ddata = pmic->palmas->pmic_ddata;
-        int id = rdev_get_id(dev);
+        struct palmas_regs_info *rinfo = &ddata->palmas_regs_info[id];
         unsigned int reg;
 
-        palmas_ldo_read(pmic->palmas,
-                        ddata->palmas_regs_info[id].ctrl_addr, &reg);
+        palmas_ldo_read(pmic->palmas, rinfo->ctrl_addr, &reg);
 
         reg &= PALMAS_LDO1_CTRL_STATUS;
 
@@ -643,11 +642,12 @@ static struct regulator_ops tps65917_ops_ldo = {
 static int palmas_regulator_config_external(struct palmas *palmas, int id,
                 struct palmas_reg_init *reg_init)
 {
-        int sleep_id = palmas_regs_info[id].sleep_id;
+        struct palmas_pmic_driver_data *ddata = palmas->pmic_ddata;
+        struct palmas_regs_info *rinfo = &ddata->palmas_regs_info[id];
         int ret;
 
-        ret = palmas_ext_control_req_config(palmas, sleep_id,
-                                        reg_init->roof_floor, true);
+        ret = palmas_ext_control_req_config(palmas, rinfo->sleep_id,
+                                            reg_init->roof_floor, true);
         if (ret < 0)
                 dev_err(palmas->dev,
                         "Ext control config for regulator %d failed %d\n",
@@ -665,12 +665,10 @@ static int palmas_smps_init(struct palmas *palmas, int id,
                 struct palmas_reg_init *reg_init)
 {
         unsigned int reg;
-        unsigned int addr;
         int ret;
-
         struct palmas_pmic_driver_data *ddata = palmas->pmic_ddata;
-
-        addr = ddata->palmas_regs_info[id].ctrl_addr;
+        struct palmas_regs_info *rinfo = &ddata->palmas_regs_info[id];
+        unsigned int addr = rinfo->ctrl_addr;
 
         ret = palmas_smps_read(palmas, addr, &reg);
         if (ret)
@@ -705,12 +703,11 @@ static int palmas_smps_init(struct palmas *palmas, int id,
         if (ret)
                 return ret;
 
-        if (ddata->palmas_regs_info[id].vsel_addr && reg_init->vsel) {
-                addr = ddata->palmas_regs_info[id].vsel_addr;
+        if (rinfo->vsel_addr && reg_init->vsel) {
 
                 reg = reg_init->vsel;
 
-                ret = palmas_smps_write(palmas, addr, reg);
+                ret = palmas_smps_write(palmas, rinfo->vsel_addr, reg);
                 if (ret)
                         return ret;
         }
@@ -718,7 +715,6 @@ static int palmas_smps_init(struct palmas *palmas, int id,
         if (reg_init->roof_floor && (id != PALMAS_REG_SMPS10_OUT1) &&
                         (id != PALMAS_REG_SMPS10_OUT2)) {
                 /* Enable externally controlled regulator */
-                addr = ddata->palmas_regs_info[id].ctrl_addr;
                 ret = palmas_smps_read(palmas, addr, &reg);
                 if (ret < 0)
                         return ret;
@@ -740,10 +736,10 @@ static int palmas_ldo_init(struct palmas *palmas, int id,
         unsigned int reg;
         unsigned int addr;
         int ret;
-
         struct palmas_pmic_driver_data *ddata = palmas->pmic_ddata;
+        struct palmas_regs_info *rinfo = &ddata->palmas_regs_info[id];
 
-        addr = ddata->palmas_regs_info[id].ctrl_addr;
+        addr = rinfo->ctrl_addr;
 
         ret = palmas_ldo_read(palmas, addr, &reg);
         if (ret)
@@ -765,7 +761,6 @@ static int palmas_ldo_init(struct palmas *palmas, int id,
 
         if (reg_init->roof_floor) {
                 /* Enable externally controlled regulator */
-                addr = ddata->palmas_regs_info[id].ctrl_addr;
                 ret = palmas_update_bits(palmas, PALMAS_LDO_BASE,
                                 addr, PALMAS_LDO1_CTRL_MODE_ACTIVE,
                                 PALMAS_LDO1_CTRL_MODE_ACTIVE);
@@ -786,10 +781,10 @@ static int palmas_extreg_init(struct palmas *palmas, int id,
         unsigned int addr;