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

Commit 055d7f0f authored by Mika Westerberg's avatar Mika Westerberg Committed by Anton Vorontsov
Browse files

smb347-charger: Rename few functions to match better what they are doing 



The naming used in the driver for some functions is not very clear what
the functions are really doing. To make this a bit easier to understand
we rename few functions which were badly named.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarAnton Vorontsov <anton.vorontsov@linaro.org>
parent b75ef1d8

drivers/power/smb347-charger.c

+21 −21
Original line number Diff line number Diff line
@@ -235,14 +235,14 @@ static int smb347_write(struct smb347_charger *smb, u8 reg, u8 val) 
}



/**

 * smb347_update_status - updates the charging status

 * smb347_update_ps_status - refreshes the power source status

 * @smb: pointer to smb347 charger instance

 *

 * Function checks status of the charging and updates internal state

 * accordingly. Returns %0 if there is no change in status, %1 if the

 * status has changed and negative errno in case of failure.

 * Function checks whether any power source is connected to the charger and

 * updates internal state accordingly. If there is a change to previous state

 * function returns %1, otherwise %0 and negative errno in case of errror.

 */

static int smb347_update_status(struct smb347_charger *smb)

static int smb347_update_ps_status(struct smb347_charger *smb)

{

	bool usb = false;

	bool dc = false;
@@ -271,15 +271,15 @@ static int smb347_update_status(struct smb347_charger *smb) 
}



/*

 * smb347_is_online - returns whether input power source is connected

 * smb347_is_ps_online - returns whether input power source is connected

 * @smb: pointer to smb347 charger instance

 *

 * Returns %true if input power source is connected. Note that this is

 * dependent on what platform has configured for usable power sources. For

 * example if USB is disabled, this will return %false even if the USB

 * cable is connected.

 * example if USB is disabled, this will return %false even if the USB cable

 * is connected.

 */

static bool smb347_is_online(struct smb347_charger *smb)

static bool smb347_is_ps_online(struct smb347_charger *smb)

{

	bool ret;
@@ -301,7 +301,7 @@ static int smb347_charging_status(struct smb347_charger *smb) 
{

	int ret;



	if (!smb347_is_online(smb))

	if (!smb347_is_ps_online(smb))

		return 0;



	ret = smb347_read(smb, STAT_C);
@@ -351,7 +351,7 @@ static inline int smb347_charging_disable(struct smb347_charger *smb) 
	return smb347_charging_set(smb, false);

}



static int smb347_update_online(struct smb347_charger *smb)

static int smb347_start_stop_charging(struct smb347_charger *smb)

{

	int ret;
@@ -360,7 +360,7 @@ static int smb347_update_online(struct smb347_charger *smb) 
	 * disable or enable the charging. We do it manually because it

	 * depends on how the platform has configured the valid inputs.

	 */

	if (smb347_is_online(smb)) {

	if (smb347_is_ps_online(smb)) {

		ret = smb347_charging_enable(smb);

		if (ret < 0)

			dev_err(&smb->client->dev,
@@ -749,11 +749,11 @@ static int smb347_hw_init(struct smb347_charger *smb) 
	if (ret < 0)

		goto fail;



	ret = smb347_update_status(smb);

	ret = smb347_update_ps_status(smb);

	if (ret < 0)

		goto fail;



	ret = smb347_update_online(smb);

	ret = smb347_start_stop_charging(smb);



fail:

	smb347_set_writable(smb, false);
@@ -814,8 +814,8 @@ static irqreturn_t smb347_interrupt(int irq, void *data) 
	 * was connected or disconnected.

	 */

	if (irqstat_e & (IRQSTAT_E_USBIN_UV_IRQ | IRQSTAT_E_DCIN_UV_IRQ)) {

		if (smb347_update_status(smb) > 0) {

			smb347_update_online(smb);

		if (smb347_update_ps_status(smb) > 0) {

			smb347_start_stop_charging(smb);

			if (smb->pdata->use_mains)

				power_supply_changed(&smb->mains);

			if (smb->pdata->use_usb)
@@ -989,13 +989,13 @@ static int smb347_battery_get_property(struct power_supply *psy, 
	const struct smb347_charger_platform_data *pdata = smb->pdata;

	int ret;



	ret = smb347_update_status(smb);

	ret = smb347_update_ps_status(smb);

	if (ret < 0)

		return ret;



	switch (prop) {

	case POWER_SUPPLY_PROP_STATUS:

		if (!smb347_is_online(smb)) {

		if (!smb347_is_ps_online(smb)) {

			val->intval = POWER_SUPPLY_STATUS_DISCHARGING;

			break;

		}
@@ -1006,7 +1006,7 @@ static int smb347_battery_get_property(struct power_supply *psy, 
		break;



	case POWER_SUPPLY_PROP_CHARGE_TYPE:

		if (!smb347_is_online(smb))

		if (!smb347_is_ps_online(smb))

			return -ENODATA;



		/*
@@ -1039,7 +1039,7 @@ static int smb347_battery_get_property(struct power_supply *psy, 
		break;



	case POWER_SUPPLY_PROP_VOLTAGE_NOW:

		if (!smb347_is_online(smb))

		if (!smb347_is_ps_online(smb))

			return -ENODATA;

		ret = smb347_read(smb, STAT_A);

		if (ret < 0)
@@ -1053,7 +1053,7 @@ static int smb347_battery_get_property(struct power_supply *psy, 
		break;



	case POWER_SUPPLY_PROP_CURRENT_NOW:

		if (!smb347_is_online(smb))

		if (!smb347_is_ps_online(smb))

			return -ENODATA;



		ret = smb347_read(smb, STAT_B);