diff options
author | Axel Lin <axel.lin@ingics.com> | 2012-12-26 03:28:39 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-27 12:34:49 -0500 |
commit | 24bd410905919696b705a2ce1df5e1d5d4d22032 (patch) | |
tree | bb67af365a8f43c0b85ed5b670626527f94aaaac /drivers/regulator/max8997.c | |
parent | a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff) |
regulator: max8997: Remove set_voltage_time_sel setting for max8997_ldo_ops
max8997_set_voltage_ldobuck_time_sel() returns 0 for all LDOs.
Thus remove set_voltage_time_sel setting for max8997_ldo_ops.
max8997_set_voltage_ldobuck_time_sel() is only used for max8997_buck_ops now,
rename it to max8997_set_voltage_buck_time_sel().
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/max8997.c')
-rw-r--r-- | drivers/regulator/max8997.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c index df0eafb0dc7e..57e8907e9293 100644 --- a/drivers/regulator/max8997.c +++ b/drivers/regulator/max8997.c | |||
@@ -523,7 +523,7 @@ static int max8997_set_voltage_ldobuck(struct regulator_dev *rdev, | |||
523 | return ret; | 523 | return ret; |
524 | } | 524 | } |
525 | 525 | ||
526 | static int max8997_set_voltage_ldobuck_time_sel(struct regulator_dev *rdev, | 526 | static int max8997_set_voltage_buck_time_sel(struct regulator_dev *rdev, |
527 | unsigned int old_selector, | 527 | unsigned int old_selector, |
528 | unsigned int new_selector) | 528 | unsigned int new_selector) |
529 | { | 529 | { |
@@ -801,7 +801,6 @@ static struct regulator_ops max8997_ldo_ops = { | |||
801 | .disable = max8997_reg_disable, | 801 | .disable = max8997_reg_disable, |
802 | .get_voltage_sel = max8997_get_voltage_sel, | 802 | .get_voltage_sel = max8997_get_voltage_sel, |
803 | .set_voltage = max8997_set_voltage_ldobuck, | 803 | .set_voltage = max8997_set_voltage_ldobuck, |
804 | .set_voltage_time_sel = max8997_set_voltage_ldobuck_time_sel, | ||
805 | .set_suspend_disable = max8997_reg_disable_suspend, | 804 | .set_suspend_disable = max8997_reg_disable_suspend, |
806 | }; | 805 | }; |
807 | 806 | ||
@@ -812,7 +811,7 @@ static struct regulator_ops max8997_buck_ops = { | |||
812 | .disable = max8997_reg_disable, | 811 | .disable = max8997_reg_disable, |
813 | .get_voltage_sel = max8997_get_voltage_sel, | 812 | .get_voltage_sel = max8997_get_voltage_sel, |
814 | .set_voltage = max8997_set_voltage_buck, | 813 | .set_voltage = max8997_set_voltage_buck, |
815 | .set_voltage_time_sel = max8997_set_voltage_ldobuck_time_sel, | 814 | .set_voltage_time_sel = max8997_set_voltage_buck_time_sel, |
816 | .set_suspend_disable = max8997_reg_disable_suspend, | 815 | .set_suspend_disable = max8997_reg_disable_suspend, |
817 | }; | 816 | }; |
818 | 817 | ||