regulator: tps65912: Convert to get_voltage_sel

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

diff --git a/drivers/regulator/tps65912-regulator.c b/drivers/regulator/tps65912-regulator.c
index 7312e3624f570ffcb97cf4feba4a4d1a61d88e8e..18b2a1dcb4b5d6ba189fa74dfe4c8f2d23fbe1d8 100644 (file)
--- a/drivers/regulator/tps65912-regulator.c
+++ b/drivers/regulator/tps65912-regulator.c
@@ -405,7 +405,7 @@ static int tps65912_list_voltage(struct regulator_dev *dev, unsigned selector)
        return voltage;
 }
 
-static int tps65912_get_voltage(struct regulator_dev *dev)
+static int tps65912_get_voltage_sel(struct regulator_dev *dev)
 {
        struct tps65912_reg *pmic = rdev_get_drvdata(dev);
        struct tps65912 *mfd = pmic->mfd;
@@ -419,7 +419,7 @@ static int tps65912_get_voltage(struct regulator_dev *dev)
        vsel = tps65912_reg_read(mfd, reg);
        vsel &= 0x3F;
 
-       return tps65912_list_voltage(dev, vsel);
+       return vsel;
 }
 
 static int tps65912_set_voltage_sel(struct regulator_dev *dev,
@@ -444,7 +444,7 @@ 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,
+       .get_voltage_sel = tps65912_get_voltage_sel,
        .set_voltage_sel = tps65912_set_voltage_sel,
        .list_voltage = tps65912_list_voltage,
 };
@@ -454,7 +454,7 @@ 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,
+       .get_voltage_sel = tps65912_get_voltage_sel,
        .set_voltage_sel = tps65912_set_voltage_sel,
        .list_voltage = tps65912_list_voltage,
 };