regulator: max8660: Convert to set_voltage_sel and regulator_map_voltage_linear

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
index 93bcfc8d58ee2fdaa00438b57ca0ab7a688dd7df..8d531742f593616d1145fef2aa00fd22e13f4b32 100644 (file)
--- a/drivers/regulator/max8660.c
+++ b/drivers/regulator/max8660.c
@@ -135,27 +135,13 @@ static int max8660_dcdc_get_voltage_sel(struct regulator_dev *rdev)
        return selector;
 }
 
-static int max8660_dcdc_set(struct regulator_dev *rdev, int min_uV, int max_uV,
-                           unsigned int *s)
+static int max8660_dcdc_set_voltage_sel(struct regulator_dev *rdev,
+                                       unsigned int selector)
 {
        struct max8660 *max8660 = rdev_get_drvdata(rdev);
-       u8 reg, selector, bits;
+       u8 reg, bits;
        int ret;
 
-       if (min_uV < MAX8660_DCDC_MIN_UV || min_uV > MAX8660_DCDC_MAX_UV)
-               return -EINVAL;
-       if (max_uV < MAX8660_DCDC_MIN_UV || max_uV > MAX8660_DCDC_MAX_UV)
-               return -EINVAL;
-
-       selector = DIV_ROUND_UP(min_uV - MAX8660_DCDC_MIN_UV,
-                               MAX8660_DCDC_STEP);
-
-       ret = regulator_list_voltage_linear(rdev, selector);
-       if (ret < 0 || ret > max_uV)
-               return -EINVAL;
-
-       *s = selector;
-
        reg = (rdev_get_id(rdev) == MAX8660_V3) ? MAX8660_ADTV2 : MAX8660_SDTV2;
        ret = max8660_write(max8660, reg, 0, selector);
        if (ret)
@@ -169,7 +155,8 @@ static int max8660_dcdc_set(struct regulator_dev *rdev, int min_uV, int max_uV,
 static struct regulator_ops max8660_dcdc_ops = {
        .is_enabled = max8660_dcdc_is_enabled,
        .list_voltage = regulator_list_voltage_linear,
-       .set_voltage = max8660_dcdc_set,
+       .map_voltage = regulator_map_voltage_linear,
+       .set_voltage_sel = max8660_dcdc_set_voltage_sel,
        .get_voltage_sel = max8660_dcdc_get_voltage_sel,
 };
 
@@ -186,27 +173,12 @@ static int max8660_ldo5_get_voltage_sel(struct regulator_dev *rdev)
        return selector;
 }
 
-static int max8660_ldo5_set(struct regulator_dev *rdev, int min_uV, int max_uV,
-                           unsigned int *s)
+static int max8660_ldo5_set_voltage_sel(struct regulator_dev *rdev,
+                                       unsigned int selector)
 {
        struct max8660 *max8660 = rdev_get_drvdata(rdev);
-       u8 selector;
        int ret;
 
-       if (min_uV < MAX8660_LDO5_MIN_UV || min_uV > MAX8660_LDO5_MAX_UV)
-               return -EINVAL;
-       if (max_uV < MAX8660_LDO5_MIN_UV || max_uV > MAX8660_LDO5_MAX_UV)
-               return -EINVAL;
-
-       selector = DIV_ROUND_UP(min_uV - MAX8660_LDO5_MIN_UV,
-                               MAX8660_LDO5_STEP);
-
-       ret = regulator_list_voltage_linear(rdev, selector);
-       if (ret < 0 || ret > max_uV)
-               return -EINVAL;
-
-       *s = selector;
-
        ret = max8660_write(max8660, MAX8660_MDTV2, 0, selector);
        if (ret)
                return ret;
@@ -217,7 +189,8 @@ static int max8660_ldo5_set(struct regulator_dev *rdev, int min_uV, int max_uV,
 
 static struct regulator_ops max8660_ldo5_ops = {
        .list_voltage = regulator_list_voltage_linear,
-       .set_voltage = max8660_ldo5_set,
+       .map_voltage = regulator_map_voltage_linear,
+       .set_voltage_sel = max8660_ldo5_set_voltage_sel,
        .get_voltage_sel = max8660_ldo5_get_voltage_sel,
 };
 
@@ -257,31 +230,16 @@ static int max8660_ldo67_get_voltage_sel(struct regulator_dev *rdev)
        return selector;
 }
 
-static int max8660_ldo67_set(struct regulator_dev *rdev, int min_uV,
-                            int max_uV, unsigned int *s)
+static int max8660_ldo67_set_voltage_sel(struct regulator_dev *rdev,
+                                        unsigned int selector)
 {
        struct max8660 *max8660 = rdev_get_drvdata(rdev);
-       u8 selector;
-       int ret;
-
-       if (min_uV < MAX8660_LDO67_MIN_UV || min_uV > MAX8660_LDO67_MAX_UV)
-               return -EINVAL;
-       if (max_uV < MAX8660_LDO67_MIN_UV || max_uV > MAX8660_LDO67_MAX_UV)
-               return -EINVAL;
-
-       selector = DIV_ROUND_UP(min_uV - MAX8660_LDO67_MIN_UV,
-                               MAX8660_LDO67_STEP);
-
-       ret = regulator_list_voltage_linear(rdev, selector);
-       if (ret < 0 || ret > max_uV)
-               return -EINVAL;
-
-       *s = selector;
 
        if (rdev_get_id(rdev) == MAX8660_V6)
                return max8660_write(max8660, MAX8660_L12VCR, 0xf0, selector);
        else
-               return max8660_write(max8660, MAX8660_L12VCR, 0x0f, selector << 4);
+               return max8660_write(max8660, MAX8660_L12VCR, 0x0f,
+                                    selector << 4);
 }
 
 static struct regulator_ops max8660_ldo67_ops = {
@@ -289,8 +247,9 @@ static struct regulator_ops max8660_ldo67_ops = {
        .enable = max8660_ldo67_enable,
        .disable = max8660_ldo67_disable,
        .list_voltage = regulator_list_voltage_linear,
+       .map_voltage = regulator_map_voltage_linear,
        .get_voltage_sel = max8660_ldo67_get_voltage_sel,
-       .set_voltage = max8660_ldo67_set,
+       .set_voltage_sel = max8660_ldo67_set_voltage_sel,
 };
 
 static const struct regulator_desc max8660_reg[] = {