From 1152ba3ed755abf35676a80d42f19ec3dd89e06c Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Fri, 8 Jun 2012 14:35:32 +0800
Subject: [PATCH] --- yaml --- r: 312543 b: refs/heads/master c:
 e08ef739feec5341fe9382a9f5173ddd56c95f93 h: refs/heads/master i:   312541:
 d300b140deb1867a7ed3d307b1e9b5ec9a7ee3c2   312539:
 cc1e0e9f6875392df4ca28e38544ef48fe7cc5d0   312535:
 94e2ccd9ecd122719fa1698870db315ba7691326   312527:
 42202f914863572b3a76491f19caad53a9bdeede   312511:
 663a7a10f961c4fca531f4a61d76870609ac9c7b v: v3

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

diff --git a/[refs] b/[refs]
index 84c98b04afea..d838ac9dc124 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c70ad9dcf08c839b018d8c440bd8c19aabbb08a8
+refs/heads/master: e08ef739feec5341fe9382a9f5173ddd56c95f93
diff --git a/trunk/drivers/regulator/tps62360-regulator.c b/trunk/drivers/regulator/tps62360-regulator.c
index e534269ed44a..d044a58640e7 100644
--- a/trunk/drivers/regulator/tps62360-regulator.c
+++ b/trunk/drivers/regulator/tps62360-regulator.c
@@ -179,17 +179,10 @@ static int tps62360_set_voltage_time_sel(struct regulator_dev *rdev,
 		unsigned int old_selector, unsigned int new_selector)
 {
 	struct tps62360_chip *tps = rdev_get_drvdata(rdev);
-	int old_uV, new_uV;
 
-	old_uV = regulator_list_voltage_linear(rdev, old_selector);
-	if (old_uV < 0)
-		return old_uV;
-
-	new_uV = regulator_list_voltage_linear(rdev, new_selector);
-	if (new_uV < 0)
-		return new_uV;
-
-	return DIV_ROUND_UP(abs(old_uV - new_uV), tps->change_uv_per_us);
+	return DIV_ROUND_UP(abs(new_selector - old_selector) *
+			    rdev->desc->uV_step,
+			    tps->change_uv_per_us);
 }
 
 static int tps62360_set_mode(struct regulator_dev *rdev, unsigned int mode)