* [PATCH 16/22] lp8727_charger: return if the battery is discharging
@ 2012-08-31 9:26 Kim, Milo
0 siblings, 0 replies; only message in thread
From: Kim, Milo @ 2012-08-31 9:26 UTC (permalink / raw)
To: Anton Vorontsov; +Cc: David Woodhouse, linux-kernel
If the charger is pulled out, just return as DISCHARGING.
Then no need for additional 'else' statement.
Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
---
drivers/power/lp8727_charger.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c
index ce59282..ee1dfaa 100644
--- a/drivers/power/lp8727_charger.c
+++ b/drivers/power/lp8727_charger.c
@@ -336,15 +336,16 @@ static int lp8727_battery_get_property(struct power_supply *psy,
switch (psp) {
case POWER_SUPPLY_PROP_STATUS:
- if (lp8727_is_charger_attached(psy->name, pchg->devid)) {
- lp8727_read_byte(pchg, LP8727_STATUS1, &read);
+ if (!lp8727_is_charger_attached(psy->name, pchg->devid)) {
+ val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+ return 0;
+ }
+
+ lp8727_read_byte(pchg, LP8727_STATUS1, &read);
- val->intval = (read & LP8727_CHGSTAT) == LP8727_STAT_EOC ?
+ val->intval = (read & LP8727_CHGSTAT) == LP8727_STAT_EOC ?
POWER_SUPPLY_STATUS_FULL :
POWER_SUPPLY_STATUS_CHARGING;
- } else {
- val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
- }
break;
case POWER_SUPPLY_PROP_HEALTH:
lp8727_read_byte(pchg, LP8727_STATUS2, &read);
--
1.7.9.5
Best Regards,
Milo
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-08-31 9:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-31 9:26 [PATCH 16/22] lp8727_charger: return if the battery is discharging Kim, Milo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).