From a9ec0e3d41fa3c26cebe1bcaab99d60776fa406c Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 26 Mar 2012 09:30:06 +0800
Subject: [PATCH] --- yaml --- r: 302161 b: refs/heads/master c:
 dd16b1f8e7814cad47e09951529facaba4350302 h: refs/heads/master i:   302159:
 fc1d81b0f7ce138718874f50b59d216ddadf9ee4 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/regulator/twl-regulator.c | 27 ++++---------------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 2ae9390da0c3..ae7d9249d086 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4eb06453648bb0d1eca3669f26798a19b6f40eb8
+refs/heads/master: dd16b1f8e7814cad47e09951529facaba4350302
diff --git a/trunk/drivers/regulator/twl-regulator.c b/trunk/drivers/regulator/twl-regulator.c
index 9cdfc389ca26..107a08bc50d9 100644
--- a/trunk/drivers/regulator/twl-regulator.c
+++ b/trunk/drivers/regulator/twl-regulator.c
@@ -473,31 +473,12 @@ static int twl4030ldo_list_voltage(struct regulator_dev *rdev, unsigned index)
 }
 
 static int
-twl4030ldo_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,
-		       unsigned *selector)
+twl4030ldo_set_voltage_sel(struct regulator_dev *rdev, unsigned selector)
 {
 	struct twlreg_info	*info = rdev_get_drvdata(rdev);
-	int			vsel;
-
-	for (vsel = 0; vsel < info->table_len; vsel++) {
-		int mV = info->table[vsel];
-		int uV;
-
-		if (IS_UNSUP(mV))
-			continue;
-		uV = LDO_MV(mV) * 1000;
-
-		/* REVISIT for VAUX2, first match may not be best/lowest */
-
-		/* use the first in-range value */
-		if (min_uV <= uV && uV <= max_uV) {
-			*selector = vsel;
-			return twlreg_write(info, TWL_MODULE_PM_RECEIVER,
-							VREG_VOLTAGE, vsel);
-		}
-	}
 
-	return -EDOM;
+	return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE,
+			    selector);
 }
 
 static int twl4030ldo_get_voltage(struct regulator_dev *rdev)
@@ -516,7 +497,7 @@ static int twl4030ldo_get_voltage(struct regulator_dev *rdev)
 static struct regulator_ops twl4030ldo_ops = {
 	.list_voltage	= twl4030ldo_list_voltage,
 
-	.set_voltage	= twl4030ldo_set_voltage,
+	.set_voltage_sel = twl4030ldo_set_voltage_sel,
 	.get_voltage	= twl4030ldo_get_voltage,
 
 	.enable		= twl4030reg_enable,