[PATCH 1/2] regulator: max8952: Remove wrong set_suspend_disable callback setting

[PATCH 1/2] regulator: max8952: Remove wrong set_suspend_disable callback setting

[Axel Lin]

Using the same ops for both .disable and .set_suspend_disable callbacks is
actively broken. This patch removes .set_suspend_disable callback setting.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/regulator/max8952.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c
index 910c9b2..ea58a44 100644
--- a/drivers/regulator/max8952.c
+++ b/drivers/regulator/max8952.c
@@ -151,7 +151,6 @@ static struct regulator_ops max8952_ops = {
 	.disable		= max8952_disable,
 	.get_voltage_sel	= max8952_get_voltage_sel,
 	.set_voltage_sel	= max8952_set_voltage_sel,
-	.set_suspend_disable	= max8952_disable,
 };
 
 static const struct regulator_desc regulator = {
-- 
1.7.9.5

[PATCH 2/2] regulator: max8998: Remove wrong set_suspend_[en|dis]able callback settings

[Axel Lin]

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>
---
 drivers/regulator/max8998.c |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c
index a1fa266..5dfa920 100644
--- a/drivers/regulator/max8998.c
+++ b/drivers/regulator/max8998.c
@@ -460,8 +460,6 @@ static struct regulator_ops max8998_ldo_ops = {
 	.disable		= max8998_ldo_disable,
 	.get_voltage_sel	= max8998_get_voltage_sel,
 	.set_voltage_sel	= max8998_set_voltage_ldo_sel,
-	.set_suspend_enable	= max8998_ldo_enable,
-	.set_suspend_disable	= max8998_ldo_disable,
 };
 
 static struct regulator_ops max8998_buck_ops = {
@@ -473,16 +471,12 @@ static struct regulator_ops max8998_buck_ops = {
 	.get_voltage_sel	= max8998_get_voltage_sel,
 	.set_voltage_sel	= max8998_set_voltage_buck_sel,
 	.set_voltage_time_sel	= max8998_set_voltage_buck_time_sel,
-	.set_suspend_enable	= max8998_ldo_enable,
-	.set_suspend_disable	= max8998_ldo_disable,
 };
 
 static struct regulator_ops max8998_others_ops = {
 	.is_enabled		= max8998_ldo_is_enabled,
 	.enable			= max8998_ldo_enable,
 	.disable		= max8998_ldo_disable,
-	.set_suspend_enable	= max8998_ldo_enable,
-	.set_suspend_disable	= max8998_ldo_disable,
 };
 
 static struct regulator_desc regulators[] = {
-- 
1.7.9.5

Re: [PATCH 1/2] regulator: max8952: Remove wrong set_suspend_disable callback setting

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

On Fri, Jul 06, 2012 at 07:24:12PM +0800, Axel Lin wrote:
> Using the same ops for both .disable and .set_suspend_disable callbacks is
> actively broken. This patch removes .set_suspend_disable callback setting.

Applied both, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]