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

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>
This commit is contained in:
Nishanth Menon 2016-05-05 19:29:50 -05:00 committed by Mark Brown
parent 036d193d33
commit 1b42443db6
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/regulator/palmas-regulator.c
View File

@ -1492,19 +1492,19 @@ static void palmas_dt_to_pdata(struct device *dev,
for (idx = 0; idx < ddata->max_reg; idx++) { for (idx = 0; idx < ddata->max_reg; idx++) {
static struct of_regulator_match *match; static struct of_regulator_match *match;
struct palmas_reg_init *rinit;
match = &ddata->palmas_matches[idx]; match = &ddata->palmas_matches[idx];
if (!match->init_data || !match->of_node) if (!match->init_data || !match->of_node)
continue; continue;
rinit = devm_kzalloc(dev, sizeof(*rinit), GFP_KERNEL);
pdata->reg_data[idx] = match->init_data; pdata->reg_data[idx] = match->init_data;
pdata->reg_init[idx] = rinit;
pdata->reg_init[idx] = devm_kzalloc(dev, rinit->warm_reset = of_property_read_bool(match->of_node,
sizeof(struct palmas_reg_init), GFP_KERNEL); "ti,warm-reset");
pdata->reg_init[idx]->warm_reset =
of_property_read_bool(match->of_node, "ti,warm-reset");
ret = of_property_read_u32(match->of_node, "ti,roof-floor", ret = of_property_read_u32(match->of_node, "ti,roof-floor",
&prop); &prop);
@ -1533,18 +1533,17 @@ static void palmas_dt_to_pdata(struct device *dev,
break; break;
} }
} }
pdata->reg_init[idx]->roof_floor = econtrol; rinit->roof_floor = econtrol;
} }
ret = of_property_read_u32(match->of_node, "ti,mode-sleep", ret = of_property_read_u32(match->of_node, "ti,mode-sleep",
&prop); &prop);
if (!ret) if (!ret)
pdata->reg_init[idx]->mode_sleep = prop; rinit->mode_sleep = prop;
ret = of_property_read_bool(match->of_node, "ti,smps-range"); ret = of_property_read_bool(match->of_node, "ti,smps-range");
if (ret) if (ret)
pdata->reg_init[idx]->vsel = rinit->vsel = PALMAS_SMPS12_VOLTAGE_RANGE;
PALMAS_SMPS12_VOLTAGE_RANGE;
if (idx == PALMAS_REG_LDO8) if (idx == PALMAS_REG_LDO8)
pdata->enable_ldo8_tracking = of_property_read_bool( pdata->enable_ldo8_tracking = of_property_read_bool(