dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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 <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2012-04-17 23:48:27 +08:00 committed by Mark Brown
parent 94e85a3c5d
commit c245c087c5
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/regulator/max8997.c
View File

@ -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,
};