regulator: Use tps65912_get_voltage for both DCDCs and LDOs

[deliverable/linux.git] / drivers / regulator / tps65912-regulator.c

diff --git a/drivers/regulator/tps65912-regulator.c b/drivers/regulator/tps65912-regulator.c
index b36799b1f530d0bf81484d471eea483c30a4914e..05ea096cf8a710ce77717909d7513b46069eeb56 100644 (file)
--- a/drivers/regulator/tps65912-regulator.c
+++ b/drivers/regulator/tps65912-regulator.c
@@ -372,12 +372,14 @@ static unsigned int tps65912_get_mode(struct regulator_dev *dev)
        return mode;
 }
 
-static int tps65912_list_voltage_dcdc(struct regulator_dev *dev,
-                                       unsigned selector)
+static int tps65912_list_voltage(struct regulator_dev *dev, unsigned selector)
 {
        struct tps65912_reg *pmic = rdev_get_drvdata(dev);
        int range, voltage = 0, id = rdev_get_id(dev);
 
+       if (id >= TPS65912_REG_LDO1 && id <= TPS65912_REG_LDO10)
+               return tps65912_vsel_to_uv_ldo(selector);
+
        if (id > TPS65912_REG_DCDC4)
                return -EINVAL;
 
@@ -404,7 +406,7 @@ static int tps65912_list_voltage_dcdc(struct regulator_dev *dev,
        return voltage;
 }
 
-static int tps65912_get_voltage_dcdc(struct regulator_dev *dev)
+static int tps65912_get_voltage(struct regulator_dev *dev)
 {
        struct tps65912_reg *pmic = rdev_get_drvdata(dev);
        struct tps65912 *mfd = pmic->mfd;
@@ -418,7 +420,7 @@ static int tps65912_get_voltage_dcdc(struct regulator_dev *dev)
        vsel = tps65912_reg_read(mfd, reg);
        vsel &= 0x3F;
 
-       return tps65912_list_voltage_dcdc(dev, vsel);
+       return tps65912_list_voltage(dev, vsel);
 }
 
 static int tps65912_set_voltage_sel(struct regulator_dev *dev,
@@ -436,32 +438,6 @@ static int tps65912_set_voltage_sel(struct regulator_dev *dev,
        return tps65912_reg_write(mfd, reg, selector | value);
 }
 
-static int tps65912_get_voltage_ldo(struct regulator_dev *dev)
-{
-       struct tps65912_reg *pmic = rdev_get_drvdata(dev);
-       struct tps65912 *mfd = pmic->mfd;
-       int id = rdev_get_id(dev);
-       int vsel = 0;
-       u8 reg;
-
-       reg = tps65912_get_sel_register(pmic, id);
-       vsel = tps65912_reg_read(mfd, reg);
-       vsel &= 0x3F;
-
-       return tps65912_vsel_to_uv_ldo(vsel);
-}
-
-static int tps65912_list_voltage_ldo(struct regulator_dev *dev,
-                                       unsigned selector)
-{
-       int ldo = rdev_get_id(dev);
-
-       if (ldo < TPS65912_REG_LDO1 || ldo > TPS65912_REG_LDO10)
-               return -EINVAL;
-
-       return tps65912_vsel_to_uv_ldo(selector);
-}
-
 /* Operations permitted on DCDCx */
 static struct regulator_ops tps65912_ops_dcdc = {
        .is_enabled = tps65912_reg_is_enabled,
@@ -469,9 +445,9 @@ static struct regulator_ops tps65912_ops_dcdc = {
        .disable = tps65912_reg_disable,
        .set_mode = tps65912_set_mode,
        .get_mode = tps65912_get_mode,
-       .get_voltage = tps65912_get_voltage_dcdc,
+       .get_voltage = tps65912_get_voltage,
        .set_voltage_sel = tps65912_set_voltage_sel,
-       .list_voltage = tps65912_list_voltage_dcdc,
+       .list_voltage = tps65912_list_voltage,
 };
 
 /* Operations permitted on LDOx */
@@ -479,9 +455,9 @@ static struct regulator_ops tps65912_ops_ldo = {
        .is_enabled = tps65912_reg_is_enabled,
        .enable = tps65912_reg_enable,
        .disable = tps65912_reg_disable,
-       .get_voltage = tps65912_get_voltage_ldo,
+       .get_voltage = tps65912_get_voltage,
        .set_voltage_sel = tps65912_set_voltage_sel,
-       .list_voltage = tps65912_list_voltage_ldo,
+       .list_voltage = tps65912_list_voltage,
 };
 
 static __devinit int tps65912_probe(struct platform_device *pdev)