summaryrefslogtreecommitdiff
path: root/drivers/regulator/as3711-regulator.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2012-11-23 20:53:22 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-28 00:25:18 +0400
commit7a4beda0c6a87af26b7e2144842a0205fa9fd674 (patch)
tree2e237837116ca706e6ef114379c8cb483986e34a /drivers/regulator/as3711-regulator.c
parent16ed9f0701d2bb06d96754ba1d3edbf9aa5faeef (diff)
downloadlinux-7a4beda0c6a87af26b7e2144842a0205fa9fd674.tar.xz
regulator: as3711: Fix the logic in as3711_sel_check
Below equation means the "voltage" is the "smallest" voltage within specific range. ret = DIV_ROUND_UP(min - bottom) / step; voltage = ret * step + bottom; If we do try 1 down when (voltage > max), new voltage is then less than min voltage. Which means the new voltage is not in the requested voltage range. This patch also includes below cleanups: - Use DIV_ROUND_UP - rename variable 'ret' to 'sel' for better readability because as3711_sel_check returns the selector. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/as3711-regulator.c')
-rw-r--r--drivers/regulator/as3711-regulator.c23
1 files changed, 8 insertions, 15 deletions
diff --git a/drivers/regulator/as3711-regulator.c b/drivers/regulator/as3711-regulator.c
index 5e813b9059e7..2f1341db38a0 100644
--- a/drivers/regulator/as3711-regulator.c
+++ b/drivers/regulator/as3711-regulator.c
@@ -93,24 +93,17 @@ static int as3711_bound_check(struct regulator_dev *rdev,
static int as3711_sel_check(int min, int max, int bottom, int step)
{
- int ret, voltage;
+ int sel, voltage;
/* Round up min, when dividing: keeps us within the range */
- ret = (min - bottom + step - 1) / step;
- voltage = ret * step + bottom;
+ sel = DIV_ROUND_UP(min - bottom, step);
+ voltage = sel * step + bottom;
pr_debug("%s(): select %d..%d in %d+N*%d: %d\n", __func__,
- min, max, bottom, step, ret);
- if (voltage > max) {
- /*
- * Try 1 down. It will take us below min, but as long we stay
- * above bottom, we're fine.
- */
- ret--;
- voltage = ret * step + bottom;
- if (voltage < bottom)
- return -EINVAL;
- }
- return ret;
+ min, max, bottom, step, sel);
+ if (voltage > max)
+ return -EINVAL;
+
+ return sel;
}
static int as3711_map_voltage_sd(struct regulator_dev *rdev,