[PATCH v2] regulator: twl-regulator: Use DIV_ROUND_UP at appropriate places

[PATCH v2] regulator: twl-regulator: Use DIV_ROUND_UP at appropriate places

[Axel Lin]

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
v2: Remove braces {} for single statement blocks

 drivers/regulator/twl-regulator.c |   30 ++++++------------------------
 1 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 964946f..7186e67 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -806,11 +806,7 @@ twl6030smps_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,
 			vsel = 0;
 		else if ((min_uV >= 600000) && (min_uV <= 1300000)) {
 			int calc_uV;
-			vsel = (min_uV - 600000) / 125;
-			if (vsel % 100)
-				vsel += 100;
-			vsel /= 100;
-			vsel++;
+			vsel = DIV_ROUND_UP(min_uV - 600000, 12500);
 			calc_uV = twl6030smps_list_voltage(rdev, vsel);
 			if (calc_uV > max_uV)
 				return -EINVAL;
@@ -836,11 +832,7 @@ twl6030smps_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,
 			vsel = 0;
 		else if ((min_uV >= 700000) && (min_uV <= 1420000)) {
 			int calc_uV;
-			vsel = (min_uV - 700000) / 125;
-			if (vsel % 100)
-				vsel += 100;
-			vsel /= 100;
-			vsel++;
+			vsel = DIV_ROUND_UP(min_uV - 700000, 12500);
 			calc_uV = twl6030smps_list_voltage(rdev, vsel);
 			if (calc_uV > max_uV)
 				return -EINVAL;
@@ -864,24 +856,14 @@ twl6030smps_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,
 	case SMPS_EXTENDED_EN:
 		if (min_uV == 0)
 			vsel = 0;
-		else if ((min_uV >= 1852000) && (max_uV <= 4013600)) {
-			vsel = (min_uV - 1852000) / 386;
-			if (vsel % 100)
-				vsel += 100;
-			vsel /= 100;
-			vsel++;
-		}
+		else if ((min_uV >= 1852000) && (max_uV <= 4013600))
+			vsel = DIV_ROUND_UP(min_uV - 1852000, 38600);
 		break;
 	case SMPS_OFFSET_EN|SMPS_EXTENDED_EN:
 		if (min_uV == 0)
 			vsel = 0;
-		else if ((min_uV >= 2161000) && (max_uV <= 4321000)) {
-			vsel = (min_uV - 2161000) / 386;
-			if (vsel % 100)
-				vsel += 100;
-			vsel /= 100;
-			vsel++;
-		}
+		else if ((min_uV >= 2161000) && (max_uV <= 4321000))
+			vsel = DIV_ROUND_UP(min_uV - 2161000, 38600);
 		break;
 	}
 
-- 
1.7.5.4

Re: [PATCH v2] regulator: twl-regulator: Use DIV_ROUND_UP at appropriate places

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 123 bytes --]

On Mon, Apr 09, 2012 at 11:35:10PM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH v2] regulator: twl-regulator: Use DIV_ROUND_UP at appropriate places

[Axel Lin]

2012/4/10 Mark Brown <broonie@opensource.wolfsonmicro.com>:
> On Mon, Apr 09, 2012 at 11:35:10PM +0800, Axel Lin wrote:
>> Signed-off-by: Axel Lin <axel.lin@gmail.com>
>
> Applied, thanks.
Hi Mark,
Seems you apply V2 of the patch.
The V3 is the correct one. https://lkml.org/lkml/2012/4/9/435

( the vsel++ after DIV_ROUND_UP is required because
    current code does subtract index by 1 in the list_voltage callback.
  e.g. current code uses this trick to differential setting voltage to
0 (vsel is 0) or  600000 uV (vsel is 1) )

Regards,
Axel

Re: [PATCH v2] regulator: twl-regulator: Use DIV_ROUND_UP at appropriate places

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 201 bytes --]

On Tue, Apr 10, 2012 at 07:49:23PM +0800, Axel Lin wrote:

> Seems you apply V2 of the patch.
> The V3 is the correct one. https://lkml.org/lkml/2012/4/9/435

Send a fix if you think there are issues.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]