]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
regulator: tps6507x: Convert to get_voltage_sel
authorAxel Lin <axel.lin@gmail.com>
Fri, 20 Apr 2012 10:33:52 +0000 (18:33 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 20 Apr 2012 13:03:31 +0000 (14:03 +0100)
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/regulator/tps6507x-regulator.c

index 8e432004b949ca2a22ce4f64e8392446b2f51316..ef885acc93e6a413bb56512ca5f894ca4095842d 100644 (file)
@@ -283,7 +283,7 @@ static int tps6507x_pmic_disable(struct regulator_dev *dev)
                                        1 << shift);
 }
 
-static int tps6507x_pmic_get_voltage(struct regulator_dev *dev)
+static int tps6507x_pmic_get_voltage_sel(struct regulator_dev *dev)
 {
        struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
        int data, rid = rdev_get_id(dev);
@@ -325,7 +325,7 @@ static int tps6507x_pmic_get_voltage(struct regulator_dev *dev)
                return data;
 
        data &= mask;
-       return tps->info[rid]->table[data] * 1000;
+       return data;
 }
 
 static int tps6507x_pmic_set_voltage_sel(struct regulator_dev *dev,
@@ -395,7 +395,7 @@ static struct regulator_ops tps6507x_pmic_ops = {
        .is_enabled = tps6507x_pmic_is_enabled,
        .enable = tps6507x_pmic_enable,
        .disable = tps6507x_pmic_disable,
-       .get_voltage = tps6507x_pmic_get_voltage,
+       .get_voltage_sel = tps6507x_pmic_get_voltage_sel,
        .set_voltage_sel = tps6507x_pmic_set_voltage_sel,
        .list_voltage = tps6507x_pmic_list_voltage,
 };