summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-03-02 05:19:02 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-12 00:48:47 +0400
commit48ee1160a44b6f404f5553a6fce8447507982311 (patch)
tree43eba9f53da1041947b61ed963dd832e05278326
parent7b94791be6fb1c52c5ccb2cfde793da6c6b541b0 (diff)
downloadlinux-48ee1160a44b6f404f5553a6fce8447507982311.tar.xz
regulator: Simplify the code to get selector in isl6271a_set_voltage
Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/regulator/isl6271a-regulator.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/regulator/isl6271a-regulator.c b/drivers/regulator/isl6271a-regulator.c
index c1a456c4257c..775f5fd208c3 100644
--- a/drivers/regulator/isl6271a-regulator.c
+++ b/drivers/regulator/isl6271a-regulator.c
@@ -63,23 +63,15 @@ static int isl6271a_set_voltage(struct regulator_dev *dev,
unsigned *selector)
{
struct isl_pmic *pmic = rdev_get_drvdata(dev);
- int vsel, err, data;
+ int err, data;
if (minuV < ISL6271A_VOLTAGE_MIN || minuV > ISL6271A_VOLTAGE_MAX)
return -EINVAL;
if (maxuV < ISL6271A_VOLTAGE_MIN || maxuV > ISL6271A_VOLTAGE_MAX)
return -EINVAL;
- /* Align to 50000 mV */
- vsel = minuV - (minuV % ISL6271A_VOLTAGE_STEP);
-
- /* If the result fell out of [minuV,maxuV] range, put it back */
- if (vsel < minuV)
- vsel += ISL6271A_VOLTAGE_STEP;
-
- /* Convert the microvolts to data for the chip */
- data = (vsel - ISL6271A_VOLTAGE_MIN) / ISL6271A_VOLTAGE_STEP;
-
+ data = DIV_ROUND_UP(minuV - ISL6271A_VOLTAGE_MIN,
+ ISL6271A_VOLTAGE_STEP);
*selector = data;
mutex_lock(&pmic->mtx);