diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-04-17 17:48:27 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-23 14:20:24 +0200 |
| commit | c245c087c50eabe284b22f7d5a8abc12427d29a7 (patch) | |
| tree | 1572f5b272cec44a50268cdd35d140206d52bdf7 /drivers/regulator | |
| parent | regulator: s5m8767: Use DIV_ROUND_UP to calculate selector (diff) | |
| download | linux-c245c087c50eabe284b22f7d5a8abc12427d29a7.tar.xz linux-c245c087c50eabe284b22f7d5a8abc12427d29a7.zip | |
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>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/max8997.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c index ec99bd30e603..d106b74fc821 100644 --- a/drivers/regulator/max8997.c +++ b/drivers/regulator/max8997.c @@ -278,9 +278,7 @@ static int max8997_reg_is_enabled(struct regulator_dev *rdev) u8 val; ret = max8997_get_enable_register(rdev, ®, &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, }; |