diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-04-20 23:03:34 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-23 08:20:27 -0400 |
commit | 9db7f05624ffa845400d2bd2bfe5b9793985ce34 (patch) | |
tree | 9d7a74581e3714d7b6dc76c065d27d672c3233d6 /drivers/regulator/tps65912-regulator.c | |
parent | 0f80ea1499ae047dcaa29ccecfe0d58bb229c4e9 (diff) |
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>
Diffstat (limited to 'drivers/regulator/tps65912-regulator.c')
-rw-r--r-- | drivers/regulator/tps65912-regulator.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/regulator/tps65912-regulator.c b/drivers/regulator/tps65912-regulator.c index 7312e3624f57..18b2a1dcb4b5 100644 --- 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) | |||
405 | return voltage; | 405 | return voltage; |
406 | } | 406 | } |
407 | 407 | ||
408 | static int tps65912_get_voltage(struct regulator_dev *dev) | 408 | static int tps65912_get_voltage_sel(struct regulator_dev *dev) |
409 | { | 409 | { |
410 | struct tps65912_reg *pmic = rdev_get_drvdata(dev); | 410 | struct tps65912_reg *pmic = rdev_get_drvdata(dev); |
411 | struct tps65912 *mfd = pmic->mfd; | 411 | struct tps65912 *mfd = pmic->mfd; |
@@ -419,7 +419,7 @@ static int tps65912_get_voltage(struct regulator_dev *dev) | |||
419 | vsel = tps65912_reg_read(mfd, reg); | 419 | vsel = tps65912_reg_read(mfd, reg); |
420 | vsel &= 0x3F; | 420 | vsel &= 0x3F; |
421 | 421 | ||
422 | return tps65912_list_voltage(dev, vsel); | 422 | return vsel; |
423 | } | 423 | } |
424 | 424 | ||
425 | static int tps65912_set_voltage_sel(struct regulator_dev *dev, | 425 | static int tps65912_set_voltage_sel(struct regulator_dev *dev, |
@@ -444,7 +444,7 @@ static struct regulator_ops tps65912_ops_dcdc = { | |||
444 | .disable = tps65912_reg_disable, | 444 | .disable = tps65912_reg_disable, |
445 | .set_mode = tps65912_set_mode, | 445 | .set_mode = tps65912_set_mode, |
446 | .get_mode = tps65912_get_mode, | 446 | .get_mode = tps65912_get_mode, |
447 | .get_voltage = tps65912_get_voltage, | 447 | .get_voltage_sel = tps65912_get_voltage_sel, |
448 | .set_voltage_sel = tps65912_set_voltage_sel, | 448 | .set_voltage_sel = tps65912_set_voltage_sel, |
449 | .list_voltage = tps65912_list_voltage, | 449 | .list_voltage = tps65912_list_voltage, |
450 | }; | 450 | }; |
@@ -454,7 +454,7 @@ static struct regulator_ops tps65912_ops_ldo = { | |||
454 | .is_enabled = tps65912_reg_is_enabled, | 454 | .is_enabled = tps65912_reg_is_enabled, |
455 | .enable = tps65912_reg_enable, | 455 | .enable = tps65912_reg_enable, |
456 | .disable = tps65912_reg_disable, | 456 | .disable = tps65912_reg_disable, |
457 | .get_voltage = tps65912_get_voltage, | 457 | .get_voltage_sel = tps65912_get_voltage_sel, |
458 | .set_voltage_sel = tps65912_set_voltage_sel, | 458 | .set_voltage_sel = tps65912_set_voltage_sel, |
459 | .list_voltage = tps65912_list_voltage, | 459 | .list_voltage = tps65912_list_voltage, |
460 | }; | 460 | }; |