Skip to contentSkip to conversation

regulator: max8997: Remove is_enabled callback implementation for max8997_charger_fixedstate_ops

PATCH Applied Axel Lin 2 participants 3 messages Apr 17, 2012 – Apr 23, 2012 Voltage and current regulator framework

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/2 regulator: max8997: Remove is_enabled callback implementation for max8997_charger_fixedstate_ops

If is_enabled callback is not implemented, the core assumes that the regulator is on.

This is simpler than having a hack to retrun 1 in max8997_reg_is_enabled() if max8997_get_enable_register() returns -EINVAL.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/regulator/max8997.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
drivers/regulator/max8997.c +1 -4
index 99d7cb3..0796ad8 100644
@@ -278,9 +278,7 @@ static int max8997_reg_is_enabled(struct regulator_dev *rdev)
 	u8 val;
 
 	ret = max8997_get_enable_register(rdev, &reg, &mask, &pattern);
-	if (ret == -EINVAL)
-		return 1; /* "not controllable" */
-	else if (ret)
+	if (ret)
 		return ret;
 
 	ret = max8997_read_reg(i2c, reg, &val);

@@ -887,7 +885,6 @@ static struct regulator_ops max8997_charger_ops = {
 };
 
 static struct regulator_ops max8997_charger_fixedstate_ops = {
-	.is_enabled		= max8997_reg_is_enabled,
 	.get_current_limit	= max8997_get_current_limit,
 	.set_current_limit	= max8997_set_current_limit,
 };
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 2/2 regulator: max8997: Remove empty set_suspend_enable callback implementation

Since commit 8ac0e95 "regulator: core: Support setting suspend_[mode|voltage] if set_suspend_[en|dis]able is NULL", now the regulator core can properly handle the case set_suspend_enable callback is NULL.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/regulator/max8997.c |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)
drivers/regulator/max8997.c +0 -9
index 0796ad8..f4ab2e3 100644
@@ -766,11 +766,6 @@ static int max8997_set_voltage_safeout(struct regulator_dev *rdev,
 	return ret;
 }
 
-static int max8997_reg_enable_suspend(struct regulator_dev *rdev)
-{
-	return 0;
-}
-
 static int max8997_reg_disable_suspend(struct regulator_dev *rdev)
 {
 	struct max8997_data *max8997 = rdev_get_drvdata(rdev);

@@ -806,7 +801,6 @@ static struct regulator_ops max8997_ldo_ops = {
 	.get_voltage_sel	= max8997_get_voltage_sel,
 	.set_voltage		= max8997_set_voltage_ldobuck,
 	.set_voltage_time_sel	= max8997_set_voltage_ldobuck_time_sel,
-	.set_suspend_enable	= max8997_reg_enable_suspend,
 	.set_suspend_disable	= max8997_reg_disable_suspend,
 };
 

@@ -818,7 +812,6 @@ static struct regulator_ops max8997_buck_ops = {
 	.get_voltage_sel	= max8997_get_voltage_sel,
 	.set_voltage		= max8997_set_voltage_buck,
 	.set_voltage_time_sel	= max8997_set_voltage_ldobuck_time_sel,
-	.set_suspend_enable	= max8997_reg_enable_suspend,
 	.set_suspend_disable	= max8997_reg_disable_suspend,
 };
 

@@ -827,7 +820,6 @@ static struct regulator_ops max8997_fixedvolt_ops = {
 	.is_enabled		= max8997_reg_is_enabled,
 	.enable			= max8997_reg_enable,
 	.disable		= max8997_reg_disable,
-	.set_suspend_enable	= max8997_reg_enable_suspend,
 	.set_suspend_disable	= max8997_reg_disable_suspend,
 };
 

@@ -838,7 +830,6 @@ static struct regulator_ops max8997_safeout_ops = {
 	.disable		= max8997_reg_disable,
 	.get_voltage_sel	= max8997_get_voltage_sel,
 	.set_voltage		= max8997_set_voltage_safeout,
-	.set_suspend_enable	= max8997_reg_enable_suspend,
 	.set_suspend_disable	= max8997_reg_disable_suspend,
 };
Signature · 1 line
1.7.5.4
Applied
#2 lore raw
In reply to Axel Lin
Quoted 2 lines · Axel Lin

If is_enabled callback is not implemented, the core assumes that the regulator is on.

Applied, thanks.