Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c245c087 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

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: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 94e85a3c

drivers/regulator/max8997.c

+1 −4
Original line number Diff line number Diff line
@@ -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,

};