diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-07-06 07:25:07 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-09 14:45:12 -0400 |
commit | aa851193bdf140c85b660c2a070e53316ad2a4d3 (patch) | |
tree | f2e743b7ea3f377b04e0f0018f9979074c2a34a1 /drivers/regulator/max8998.c | |
parent | b1a397dc1a59cc482e623e780514acb8bb29e3bf (diff) |
regulator: max8998: Remove wrong set_suspend_[en|dis]able callback settings
Using the same ops for both [en|dis]able and set_suspend_[en|dis]able
callbacks is actively broken. This patch removes .set_suspend_disable and
.set_suspend_enable callback setting.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/max8998.c')
-rw-r--r-- | drivers/regulator/max8998.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c index a1fa26613494..5dfa920ff0c8 100644 --- a/drivers/regulator/max8998.c +++ b/drivers/regulator/max8998.c | |||
@@ -460,8 +460,6 @@ static struct regulator_ops max8998_ldo_ops = { | |||
460 | .disable = max8998_ldo_disable, | 460 | .disable = max8998_ldo_disable, |
461 | .get_voltage_sel = max8998_get_voltage_sel, | 461 | .get_voltage_sel = max8998_get_voltage_sel, |
462 | .set_voltage_sel = max8998_set_voltage_ldo_sel, | 462 | .set_voltage_sel = max8998_set_voltage_ldo_sel, |
463 | .set_suspend_enable = max8998_ldo_enable, | ||
464 | .set_suspend_disable = max8998_ldo_disable, | ||
465 | }; | 463 | }; |
466 | 464 | ||
467 | static struct regulator_ops max8998_buck_ops = { | 465 | static struct regulator_ops max8998_buck_ops = { |
@@ -473,16 +471,12 @@ static struct regulator_ops max8998_buck_ops = { | |||
473 | .get_voltage_sel = max8998_get_voltage_sel, | 471 | .get_voltage_sel = max8998_get_voltage_sel, |
474 | .set_voltage_sel = max8998_set_voltage_buck_sel, | 472 | .set_voltage_sel = max8998_set_voltage_buck_sel, |
475 | .set_voltage_time_sel = max8998_set_voltage_buck_time_sel, | 473 | .set_voltage_time_sel = max8998_set_voltage_buck_time_sel, |
476 | .set_suspend_enable = max8998_ldo_enable, | ||
477 | .set_suspend_disable = max8998_ldo_disable, | ||
478 | }; | 474 | }; |
479 | 475 | ||
480 | static struct regulator_ops max8998_others_ops = { | 476 | static struct regulator_ops max8998_others_ops = { |
481 | .is_enabled = max8998_ldo_is_enabled, | 477 | .is_enabled = max8998_ldo_is_enabled, |
482 | .enable = max8998_ldo_enable, | 478 | .enable = max8998_ldo_enable, |
483 | .disable = max8998_ldo_disable, | 479 | .disable = max8998_ldo_disable, |
484 | .set_suspend_enable = max8998_ldo_enable, | ||
485 | .set_suspend_disable = max8998_ldo_disable, | ||
486 | }; | 480 | }; |
487 | 481 | ||
488 | static struct regulator_desc regulators[] = { | 482 | static struct regulator_desc regulators[] = { |