1 files changed, 7 insertions, 17 deletions

diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index bb51decfcb8e..de99b784c5da 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -560,37 +560,27 @@ static struct regulator_ops twl6030coresmps_ops = {
 };
 
 static int
-twl6030ldo_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,
-                       unsigned *selector)
+twl6030ldo_set_voltage_sel(struct regulator_dev *rdev, unsigned selector)
 {
         struct twlreg_info      *info = rdev_get_drvdata(rdev);
-        int                     vsel;
 
-        if ((min_uV/1000 < info->min_mV) || (max_uV/1000 > info->max_mV))
-                return -EDOM;
-
-        vsel = DIV_ROUND_UP(min_uV - rdev->desc->min_uV, rdev->desc->uV_step);
-        *selector = vsel;
-
-        return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE, vsel);
+        return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE,
+                            selector);
 }
 
-static int twl6030ldo_get_voltage(struct regulator_dev *rdev)
+static int twl6030ldo_get_voltage_sel(struct regulator_dev *rdev)
 {
         struct twlreg_info      *info = rdev_get_drvdata(rdev);
         int vsel = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE);
 
-        if (vsel < 0)
-                return vsel;
-
-        return rdev->desc->min_uV + vsel * rdev->desc->uV_step;
+        return vsel;
 }
 
 static struct regulator_ops twl6030ldo_ops = {
         .list_voltage   = regulator_list_voltage_linear,
 
-        .set_voltage    = twl6030ldo_set_voltage,
-        .get_voltage    = twl6030ldo_get_voltage,
+        .set_voltage_sel = twl6030ldo_set_voltage_sel,
+        .get_voltage_sel = twl6030ldo_get_voltage_sel,
 
         .enable         = twl6030reg_enable,
         .disable        = twl6030reg_disable,