UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

lp8727_charger: Use the definition rather than enum 

Enum lp8727_chg_state can be removed because only one charger status is
used - EOC(End Of Charge).

To check whether the EOC is reached or not, use simple comparison rather
than shift-operation.

Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
This commit is contained in:
Kim, Milo 2012-08-31 09:24:37 +00:00 committed by Anton Vorontsov
parent b1ad079680
commit faaae9bbb1
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/power/lp8727_charger.c
View File

@ -55,6 +55,7 @@
#define CHGSTAT (3 << 4) #define CHGSTAT (3 << 4)
#define CHPORT (1 << 6) #define CHPORT (1 << 6)
#define DCPORT (1 << 7) #define DCPORT (1 << 7)
#define LP8727_STAT_EOC 0x30
/* STATUS2 register */ /* STATUS2 register */
#define TEMP_STAT (3 << 5) #define TEMP_STAT (3 << 5)
@ -69,13 +70,6 @@ enum lp8727_dev_id {
ID_MAX, ID_MAX,
}; };
enum lp8727_chg_stat {
PRECHG,
CC,
CV,
EOC,
};
enum lp8727_die_temp { enum lp8727_die_temp {
LP8788_TEMP_75C, LP8788_TEMP_75C,
LP8788_TEMP_95C, LP8788_TEMP_95C,
@ -348,10 +342,10 @@ static int lp8727_battery_get_property(struct power_supply *psy,
case POWER_SUPPLY_PROP_STATUS: case POWER_SUPPLY_PROP_STATUS:
if (lp8727_is_charger_attached(psy->name, pchg->devid)) { if (lp8727_is_charger_attached(psy->name, pchg->devid)) {
lp8727_read_byte(pchg, STATUS1, &read); lp8727_read_byte(pchg, STATUS1, &read);
if (((read & CHGSTAT) >> 4) == EOC)
val->intval = POWER_SUPPLY_STATUS_FULL; val->intval = (read & CHGSTAT) == LP8727_STAT_EOC ?
else POWER_SUPPLY_STATUS_FULL :
val->intval = POWER_SUPPLY_STATUS_CHARGING; POWER_SUPPLY_STATUS_CHARGING;
} else { } else {
val->intval = POWER_SUPPLY_STATUS_DISCHARGING; val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
} }