iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regulator: wm8400: Use wm8400_ldo_list_voltage instead of open code to verify selected voltage

Browse Source 
Call wm8400_ldo_list_voltage() instead of open code to verify selected voltage
falls within specified range.
Use wm8400_ldo_list_voltage() here is less error prone.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2012-06-12 16:34:55 +08:00 committed by Mark Brown
parent 3fe3a182ad
commit 38c20eb23f
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/regulator/wm8400-regulator.c
View File

@ -35,27 +35,19 @@ static int wm8400_ldo_map_voltage(struct regulator_dev *dev,
int min_uV, int max_uV) int min_uV, int max_uV)
{ {
u16 val; u16 val;
int volt;
if (min_uV < 900000 || min_uV > 3300000) if (min_uV < 900000 || min_uV > 3300000)
return -EINVAL; return -EINVAL;
if (min_uV < 1700000) { if (min_uV < 1700000) /* Steps of 50mV from 900mV; */
/* Steps of 50mV from 900mV; */
val = DIV_ROUND_UP(min_uV - 900000, 50000); val = DIV_ROUND_UP(min_uV - 900000, 50000);
else /* Steps of 100mV from 1700mV */
val = DIV_ROUND_UP(min_uV - 1700000, 100000) + 15;
if ((val * 50000) + 900000 > max_uV) volt = wm8400_ldo_list_voltage(dev, val);
return -EINVAL; if (volt < min_uV || volt > max_uV)
BUG_ON((val * 50000) + 900000 < min_uV); return -EINVAL;
} else {
/* Steps of 100mV from 1700mV */
val = DIV_ROUND_UP(min_uV - 1700000, 100000);
if ((val * 100000) + 1700000 > max_uV)
return -EINVAL;
BUG_ON((val * 100000) + 1700000 < min_uV);
val += 0xf;
}
return val; return val;
} }