redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
This commit is contained in:
Mika Westerberg 2012-04-16 11:48:39 +03:00 committed by Anton Vorontsov
parent b75ef1d807
commit 055d7f0f29
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
drivers/power/smb347-charger.c
View file

@ -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 * @smb: pointer to smb347 charger instance
* *
* Function checks status of the charging and updates internal state * Function checks whether any power source is connected to the charger and
* accordingly. Returns %0 if there is no change in status, %1 if the * updates internal state accordingly. If there is a change to previous state
* status has changed and negative errno in case of failure. * 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 usb = false;
bool dc = 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 * @smb: pointer to smb347 charger instance
* *
* Returns %true if input power source is connected. Note that this is * Returns %true if input power source is connected. Note that this is
* dependent on what platform has configured for usable power sources. For * dependent on what platform has configured for usable power sources. For
* example if USB is disabled, this will return %false even if the USB * example if USB is disabled, this will return %false even if the USB cable
* cable is connected. * is connected.
*/ */
static bool smb347_is_online(struct smb347_charger *smb) static bool smb347_is_ps_online(struct smb347_charger *smb)
{ {
bool ret; bool ret;
@ -301,7 +301,7 @@ static int smb347_charging_status(struct smb347_charger *smb)
{ {
int ret; int ret;
if (!smb347_is_online(smb)) if (!smb347_is_ps_online(smb))
return 0; return 0;
ret = smb347_read(smb, STAT_C); 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); 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; 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 * disable or enable the charging. We do it manually because it
* depends on how the platform has configured the valid inputs. * 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); ret = smb347_charging_enable(smb);
if (ret < 0) if (ret < 0)
dev_err(&smb->client->dev, dev_err(&smb->client->dev,
@ -749,11 +749,11 @@ static int smb347_hw_init(struct smb347_charger *smb)
if (ret < 0) if (ret < 0)
goto fail; goto fail;
ret = smb347_update_status(smb); ret = smb347_update_ps_status(smb);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
ret = smb347_update_online(smb); ret = smb347_start_stop_charging(smb);
fail: fail:
smb347_set_writable(smb, false); smb347_set_writable(smb, false);
@ -814,8 +814,8 @@ static irqreturn_t smb347_interrupt(int irq, void *data)
* was connected or disconnected. * was connected or disconnected.
*/ */
if (irqstat_e & (IRQSTAT_E_USBIN_UV_IRQ | IRQSTAT_E_DCIN_UV_IRQ)) { if (irqstat_e & (IRQSTAT_E_USBIN_UV_IRQ | IRQSTAT_E_DCIN_UV_IRQ)) {
if (smb347_update_status(smb) > 0) { if (smb347_update_ps_status(smb) > 0) {
smb347_update_online(smb); smb347_start_stop_charging(smb);
if (smb->pdata->use_mains) if (smb->pdata->use_mains)
power_supply_changed(&smb->mains); power_supply_changed(&smb->mains);
if (smb->pdata->use_usb) 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; const struct smb347_charger_platform_data *pdata = smb->pdata;
int ret; int ret;
ret = smb347_update_status(smb); ret = smb347_update_ps_status(smb);
if (ret < 0) if (ret < 0)
return ret; return ret;
switch (prop) { switch (prop) {
case POWER_SUPPLY_PROP_STATUS: case POWER_SUPPLY_PROP_STATUS:
if (!smb347_is_online(smb)) { if (!smb347_is_ps_online(smb)) {
val->intval = POWER_SUPPLY_STATUS_DISCHARGING; val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
break; break;
} }
@ -1006,7 +1006,7 @@ static int smb347_battery_get_property(struct power_supply *psy,
break; break;
case POWER_SUPPLY_PROP_CHARGE_TYPE: case POWER_SUPPLY_PROP_CHARGE_TYPE:
if (!smb347_is_online(smb)) if (!smb347_is_ps_online(smb))
return -ENODATA; return -ENODATA;
/* /*
@ -1039,7 +1039,7 @@ static int smb347_battery_get_property(struct power_supply *psy,
break; break;
case POWER_SUPPLY_PROP_VOLTAGE_NOW: case POWER_SUPPLY_PROP_VOLTAGE_NOW:
if (!smb347_is_online(smb)) if (!smb347_is_ps_online(smb))
return -ENODATA; return -ENODATA;
ret = smb347_read(smb, STAT_A); ret = smb347_read(smb, STAT_A);
if (ret < 0) if (ret < 0)
@ -1053,7 +1053,7 @@ static int smb347_battery_get_property(struct power_supply *psy,
break; break;
case POWER_SUPPLY_PROP_CURRENT_NOW: case POWER_SUPPLY_PROP_CURRENT_NOW:
if (!smb347_is_online(smb)) if (!smb347_is_ps_online(smb))
return -ENODATA; return -ENODATA;
ret = smb347_read(smb, STAT_B); ret = smb347_read(smb, STAT_B);