From: Axel Lin Date: Tue, 17 Apr 2012 15:48:27 +0000 (+0800) Subject: regulator: max8997: Remove is_enabled callback implementation for max8997_charger_fix... X-Git-Tag: v3.5-rc1~177^2~57^2~20 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c245c087c50eabe284b22f7d5a8abc12427d29a7;p=~emulex%2Finfiniband.git 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 Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c index ec99bd30e60..d106b74fc82 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, };