| Message ID | 1430305114-23598-4-git-send-email-k.kozlowski.k@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Wed, Apr 29, 2015 at 07:58:28PM +0900, Krzysztof Kozlowski wrote: > The custom implementation of 'regulator_ops.is_enabled' callback for > charger regulator is exactly the same as regulator_is_enabled_regmap() > with 'enable_val' set. Applied, thanks.
2015-04-29 20:03 GMT+09:00 Mark Brown <broonie@kernel.org>: > On Wed, Apr 29, 2015 at 07:58:28PM +0900, Krzysztof Kozlowski wrote: >> The custom implementation of 'regulator_ops.is_enabled' callback for >> charger regulator is exactly the same as regulator_is_enabled_regmap() >> with 'enable_val' set. > > Applied, thanks. Woo! That was fast... Thank you! Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/regulator/max77693.c b/drivers/regulator/max77693.c index 9665a488e2f1..38722c8311a5 100644 --- a/drivers/regulator/max77693.c +++ b/drivers/regulator/max77693.c @@ -35,20 +35,6 @@ #define CHGIN_ILIM_STEP_20mA 20000 -/* CHARGER regulator ops */ -/* CHARGER regulator uses two bits for enabling */ -static int max77693_chg_is_enabled(struct regulator_dev *rdev) -{ - int ret; - unsigned int val; - - ret = regmap_read(rdev->regmap, rdev->desc->enable_reg, &val); - if (ret) - return ret; - - return (val & rdev->desc->enable_mask) == rdev->desc->enable_mask; -} - /* * CHARGER regulator - Min : 20mA, Max : 2580mA, step : 20mA * 0x00, 0x01, 0x2, 0x03 = 60 mA @@ -118,7 +104,7 @@ static struct regulator_ops max77693_safeout_ops = { }; static struct regulator_ops max77693_charger_ops = { - .is_enabled = max77693_chg_is_enabled, + .is_enabled = regulator_is_enabled_regmap, .enable = regulator_enable_regmap, .disable = regulator_disable_regmap, .get_current_limit = max77693_chg_get_current_limit, @@ -155,6 +141,7 @@ static const struct regulator_desc regulators[] = { .enable_reg = MAX77693_CHG_REG_CHG_CNFG_00, .enable_mask = CHG_CNFG_00_CHG_MASK | CHG_CNFG_00_BUCK_MASK, + .enable_val = CHG_CNFG_00_CHG_MASK | CHG_CNFG_00_BUCK_MASK, }, };
The custom implementation of 'regulator_ops.is_enabled' callback for charger regulator is exactly the same as regulator_is_enabled_regmap() with 'enable_val' set. Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> --- drivers/regulator/max77693.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)