---

yaml --- r: 312543 b: refs/heads/master c: e08ef73 h: refs/heads/master i: 312541: d300b14 312539: cc1e0e9 312535: 94e2ccd 312527: 42202f9 312511: 663a7a1 v: v3
git-mirror · Jun 17, 2012 · 1152ba3 · 1152ba3
1 parent 7cc14ca
commit 1152ba3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git 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
@@ -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)