summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2016-05-06 03:29:50 +0300
committerMark Brown <broonie@kernel.org>2016-05-06 20:15:17 +0300
commit1b42443db670dde5e3cb4261f77b29010b163fc6 (patch)
treed47fd2056a47f09ad45b2429ef9f6f16d9e747da /drivers/regulator
parent036d193d3337365e0d69cff9bb2593bfc1210e7b (diff)
downloadlinux-1b42443db670dde5e3cb4261f77b29010b163fc6.tar.xz
regulator: tps65917/palmas: Simplify multiple dereference of pdata->reg_init[idx]
Converting dt to platform data logic involves picking up information that is unique per regulator, however we can improve readability of the code by allocating and referencing pdata->reg_init[idx] once in the loop. While at it, use sizeof(*pointer) when allocating pointer. This allows for structure name changes with minimal code change. Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/palmas-regulator.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index 41b4e94a8d7d..3b9206224cd1 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -1492,19 +1492,19 @@ static void palmas_dt_to_pdata(struct device *dev,
for (idx = 0; idx < ddata->max_reg; idx++) {
static struct of_regulator_match *match;
+ struct palmas_reg_init *rinit;
match = &ddata->palmas_matches[idx];
if (!match->init_data || !match->of_node)
continue;
+ rinit = devm_kzalloc(dev, sizeof(*rinit), GFP_KERNEL);
pdata->reg_data[idx] = match->init_data;
+ pdata->reg_init[idx] = rinit;
- pdata->reg_init[idx] = devm_kzalloc(dev,
- sizeof(struct palmas_reg_init), GFP_KERNEL);
-
- pdata->reg_init[idx]->warm_reset =
- of_property_read_bool(match->of_node, "ti,warm-reset");
+ rinit->warm_reset = of_property_read_bool(match->of_node,
+ "ti,warm-reset");
ret = of_property_read_u32(match->of_node, "ti,roof-floor",
&prop);
@@ -1533,18 +1533,17 @@ static void palmas_dt_to_pdata(struct device *dev,
break;
}
}
- pdata->reg_init[idx]->roof_floor = econtrol;
+ rinit->roof_floor = econtrol;
}
ret = of_property_read_u32(match->of_node, "ti,mode-sleep",
&prop);
if (!ret)
- pdata->reg_init[idx]->mode_sleep = prop;
+ rinit->mode_sleep = prop;
ret = of_property_read_bool(match->of_node, "ti,smps-range");
if (ret)
- pdata->reg_init[idx]->vsel =
- PALMAS_SMPS12_VOLTAGE_RANGE;
+ rinit->vsel = PALMAS_SMPS12_VOLTAGE_RANGE;
if (idx == PALMAS_REG_LDO8)
pdata->enable_ldo8_tracking = of_property_read_bool(