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

Commit 2e66585c authored by Peter Rosin's avatar Peter Rosin Committed by Sebastian Reichel
Browse files

power: supply: bq24735: move down bq24735_{en,dis}able_charging 



bq24735_enable_charging() needs to call bq24735_config_charging(),
which is something to change later, this is just a preparatory patch.

Signed-off-by: default avatarPeter Rosin <peda@axentia.se>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
parent 5b903a15

drivers/power/supply/bq24735-charger.c

+19 −19
Original line number Diff line number Diff line
@@ -107,25 +107,6 @@ static int bq24735_update_word(struct i2c_client *client, u8 reg, 
	return bq24735_write_word(client, reg, tmp);

}



static inline int bq24735_enable_charging(struct bq24735 *charger)

{

	if (charger->pdata->ext_control)

		return 0;



	return bq24735_update_word(charger->client, BQ24735_CHG_OPT,

				   BQ24735_CHG_OPT_CHARGE_DISABLE, 0);

}



static inline int bq24735_disable_charging(struct bq24735 *charger)

{

	if (charger->pdata->ext_control)

		return 0;



	return bq24735_update_word(charger->client, BQ24735_CHG_OPT,

				   BQ24735_CHG_OPT_CHARGE_DISABLE,

				   BQ24735_CHG_OPT_CHARGE_DISABLE);

}



static int bq24735_config_charger(struct bq24735 *charger)

{

	struct bq24735_platform *pdata = charger->pdata;
@@ -177,6 +158,25 @@ static int bq24735_config_charger(struct bq24735 *charger) 
	return 0;

}



static inline int bq24735_enable_charging(struct bq24735 *charger)

{

	if (charger->pdata->ext_control)

		return 0;



	return bq24735_update_word(charger->client, BQ24735_CHG_OPT,

				   BQ24735_CHG_OPT_CHARGE_DISABLE, 0);

}



static inline int bq24735_disable_charging(struct bq24735 *charger)

{

	if (charger->pdata->ext_control)

		return 0;



	return bq24735_update_word(charger->client, BQ24735_CHG_OPT,

				   BQ24735_CHG_OPT_CHARGE_DISABLE,

				   BQ24735_CHG_OPT_CHARGE_DISABLE);

}



static bool bq24735_charger_is_present(struct bq24735 *charger)

{

	if (charger->status_gpio) {