From c1e5a3668b2abcc4c43de4a5b014f66b3ba81da5 Mon Sep 17 00:00:00 2001
From: "Kim, Milo" <Milo.Kim@ti.com>
Date: Fri, 31 Aug 2012 09:24:37 +0000
Subject: [PATCH] --- yaml --- r: 330507 b: refs/heads/master c:
 faaae9bbb1f91f8bcd03bd9976620ac08d8b4454 h: refs/heads/master i:   330505:
 1b9b8629d6aedcb51fc339e314c2f0a6d7c872b3   330503:
 b2ebb535c366928db5f6f28442448846da87418b v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/power/lp8727_charger.c | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index b383284a7353..997e52025a05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1ad079680b24386d12aa99dd9afd4eb7093bbee
+refs/heads/master: faaae9bbb1f91f8bcd03bd9976620ac08d8b4454
diff --git a/trunk/drivers/power/lp8727_charger.c b/trunk/drivers/power/lp8727_charger.c
index 1a5f4b27e001..32bf157f4815 100644
--- a/trunk/drivers/power/lp8727_charger.c
+++ b/trunk/drivers/power/lp8727_charger.c
@@ -55,6 +55,7 @@
 #define CHGSTAT		(3 << 4)
 #define CHPORT		(1 << 6)
 #define DCPORT		(1 << 7)
+#define LP8727_STAT_EOC			0x30
 
 /* STATUS2 register */
 #define TEMP_STAT	(3 << 5)
@@ -69,13 +70,6 @@ enum lp8727_dev_id {
 	ID_MAX,
 };
 
-enum lp8727_chg_stat {
-	PRECHG,
-	CC,
-	CV,
-	EOC,
-};
-
 enum lp8727_die_temp {
 	LP8788_TEMP_75C,
 	LP8788_TEMP_95C,
@@ -348,10 +342,10 @@ static int lp8727_battery_get_property(struct power_supply *psy,
 	case POWER_SUPPLY_PROP_STATUS:
 		if (lp8727_is_charger_attached(psy->name, pchg->devid)) {
 			lp8727_read_byte(pchg, STATUS1, &read);
-			if (((read & CHGSTAT) >> 4) == EOC)
-				val->intval = POWER_SUPPLY_STATUS_FULL;
-			else
-				val->intval = POWER_SUPPLY_STATUS_CHARGING;
+
+			val->intval = (read & CHGSTAT) == LP8727_STAT_EOC ?
+				POWER_SUPPLY_STATUS_FULL :
+				POWER_SUPPLY_STATUS_CHARGING;
 		} else {
 			val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
 		}