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

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

regulator: max77843: Convert to use regulator_is_enabled_regmap 



Use regulator_is_enabled_regmap() to replace max77843_reg_is_enabled().

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski.k@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b7c960d5

drivers/regulator/max77843.c

+2 −16
Original line number Diff line number Diff line
@@ -33,21 +33,6 @@ static const unsigned int max77843_safeout_voltage_table[] = { 
	3300000,

};



static int max77843_reg_is_enabled(struct regulator_dev *rdev)

{

	struct regmap *regmap = rdev->regmap;

	int ret;

	unsigned int reg;



	ret = regmap_read(regmap, rdev->desc->enable_reg, &reg);

	if (ret) {

		dev_err(&rdev->dev, "Fialed to read charger register\n");

		return ret;

	}



	return (reg & rdev->desc->enable_mask) == rdev->desc->enable_mask;

}



static int max77843_reg_get_current_limit(struct regulator_dev *rdev)

{

	struct regmap *regmap = rdev->regmap;
@@ -96,7 +81,7 @@ static int max77843_reg_set_current_limit(struct regulator_dev *rdev, 
}



static struct regulator_ops max77843_charger_ops = {

	.is_enabled		= max77843_reg_is_enabled,

	.is_enabled		= regulator_is_enabled_regmap,

	.enable			= regulator_enable_regmap,

	.disable		= regulator_disable_regmap,

	.get_current_limit	= max77843_reg_get_current_limit,
@@ -141,6 +126,7 @@ static const struct regulator_desc max77843_supported_regulators[] = { 
		.owner		= THIS_MODULE,

		.enable_reg	= MAX77843_CHG_REG_CHG_CNFG_00,

		.enable_mask	= MAX77843_CHG_MASK | MAX77843_CHG_BUCK_MASK,

		.enable_val	= MAX77843_CHG_MASK | MAX77843_CHG_BUCK_MASK,

	},

};