From 3a7d18e3ab7a14a8131cf349abc0ea471cf77043 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 13 Mar 2012 16:09:28 +0800
Subject: [PATCH] --- yaml --- r: 292063 b: refs/heads/master c:
 5db6d09a2b4663735121dfe4222860424788a93f h: refs/heads/master i:   292061:
 336bb6f3c285272051324afc4f45d925a5c07c98   292059:
 7334bb95afd02afcb01d8fec5718661bececd76a   292055:
 93da967046d8b4c7e1d242ca29cc1260944f80f2   292047:
 003a6a3eb18974f4fa7db26095a0c6f8a31cf6dd   292031:
 7e1c100d77610f94bfa0a6d4aa8caee16029571c v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/regulator/max8925-regulator.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fcdcaa6ce57a..c01f96c537e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42b5efe4f9aa40b3b0a20149fd7357d9d6c96959
+refs/heads/master: 5db6d09a2b4663735121dfe4222860424788a93f
diff --git a/trunk/drivers/regulator/max8925-regulator.c b/trunk/drivers/regulator/max8925-regulator.c
index cc290d37c463..2f242f43096e 100644
--- a/trunk/drivers/regulator/max8925-regulator.c
+++ b/trunk/drivers/regulator/max8925-regulator.c
@@ -73,7 +73,7 @@ static int max8925_set_voltage(struct regulator_dev *rdev,
 			min_uV, max_uV);
 		return -EINVAL;
 	}
-	data = (min_uV - info->min_uV + info->step_uV - 1) / info->step_uV;
+	data = DIV_ROUND_UP(min_uV - info->min_uV, info->step_uV);
 	*selector = data;
 	data <<= info->vol_shift;
 	mask = ((1 << info->vol_nbits) - 1) << info->vol_shift;
@@ -140,7 +140,7 @@ static int max8925_set_dvm_voltage(struct regulator_dev *rdev, int uV)
 	if (uV < SD1_DVM_VMIN || uV > SD1_DVM_VMAX)
 		return -EINVAL;
 
-	data = (uV - SD1_DVM_VMIN + SD1_DVM_STEP - 1) / SD1_DVM_STEP;
+	data = DIV_ROUND_UP(uV - SD1_DVM_VMIN, SD1_DVM_STEP);
 	data <<= SD1_DVM_SHIFT;
 	mask = 3 << SD1_DVM_SHIFT;