Skip to content

Commit

Permalink
regulator: lp872x: Simplify implementation of lp872x_find_regulator_i…
Browse files Browse the repository at this point in the history
…nit_data()

Pass regulator id rahter than the index to lp872x_find_regulator_init_data(),
then the code can be simpler.
We can also get max_regulators by lp->num_regulators.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Tested-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Axel Lin authored and Mark Brown committed Jul 16, 2012
1 parent c6a717c commit 5bae062
Showing 1 changed file with 7 additions and 21 deletions.
28 changes: 7 additions & 21 deletions drivers/regulator/lp872x.c
Original file line number Diff line number Diff line change
Expand Up @@ -796,30 +796,16 @@ static int lp872x_config(struct lp872x *lp)
}

static struct regulator_init_data
*lp872x_find_regulator_init_data(int idx, struct lp872x *lp)
*lp872x_find_regulator_init_data(int id, struct lp872x *lp)
{
int i, base, id, max_regulators;

switch (lp->chipid) {
case LP8720:
base = LP8720_ID_BASE;
max_regulators = LP8720_NUM_REGULATORS;
break;
case LP8725:
base = LP8725_ID_BASE;
max_regulators = LP8725_NUM_REGULATORS;
break;
default:
return NULL;
}
int i;

id = base + idx;
for (i = 0 ; i < max_regulators ; i++)
for (i = 0; i < lp->num_regulators; i++) {
if (lp->pdata->regulator_data[i].id == id)
break;
return lp->pdata->regulator_data[i].init_data;
}

return (i == max_regulators) ? NULL :
lp->pdata->regulator_data[i].init_data;
return NULL;
}

static int lp872x_regulator_register(struct lp872x *lp)
Expand All @@ -834,7 +820,7 @@ static int lp872x_regulator_register(struct lp872x *lp)
&lp8725_regulator_desc[i];

cfg.dev = lp->dev;
cfg.init_data = lp872x_find_regulator_init_data(i, lp);
cfg.init_data = lp872x_find_regulator_init_data(desc->id, lp);
cfg.driver_data = lp;
cfg.regmap = lp->regmap;

Expand Down

0 comments on commit 5bae062

Please sign in to comment.