Merge tag 'for-v3.8-part2' of git://git.infradead.org/battery-2.6

Pull battery update, part 2, from Anton Vorontsov:
 "These are left overs that I didn't have time to review/apply before
  the merge window opened.  I didn't want to "spoil" the first pull
  request with these late patches, so they were not included:

   - A small patch for the RX51 OMAP board (Nokia N900 phone), the patch
     creates a battery monitor device instance, so that it can be
     probed.  It was acked by the OMAP maintainer;

   - A couple of late bug fixes for the charger-manager: corrects corner
     cases for the battery full handling."

* tag 'for-v3.8-part2' of git://git.infradead.org/battery-2.6:
  charger-manager: Fix bug when check dropped voltage after fullbatt event
  charger-manager: Fix bug related to checking fully charged state of battery
  ARM: OMAP: rx51: Register platform device for rx51_battery

1 files changed, 16 insertions, 22 deletions

diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index adb3a4b59cb3..6ba047f5ac2c 100644
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -239,44 +239,37 @@ static bool is_full_charged(struct charger_manager *cm)
         int uV;
 
         /* If there is no battery, it cannot be charged */
-        if (!is_batt_present(cm)) {
-                val.intval = 0;
-                goto out;
-        }
+        if (!is_batt_present(cm))
+                return false;
 
         if (cm->fuel_gauge && desc->fullbatt_full_capacity > 0) {
+                val.intval = 0;
+
                 /* Not full if capacity of fuel gauge isn't full */
                 ret = cm->fuel_gauge->get_property(cm->fuel_gauge,
                                 POWER_SUPPLY_PROP_CHARGE_FULL, &val);
-                if (!ret && val.intval > desc->fullbatt_full_capacity) {
-                        val.intval = 1;
-                        goto out;
-                }
+                if (!ret && val.intval > desc->fullbatt_full_capacity)
+                        return true;
         }
 
         /* Full, if it's over the fullbatt voltage */
         if (desc->fullbatt_uV > 0) {
                 ret = get_batt_uV(cm, &uV);
-                if (!ret && uV >= desc->fullbatt_uV) {
-                        val.intval = 1;
-                        goto out;
-                }
+                if (!ret && uV >= desc->fullbatt_uV)
+                        return true;
         }
 
         /* Full, if the capacity is more than fullbatt_soc */
         if (cm->fuel_gauge && desc->fullbatt_soc > 0) {
+                val.intval = 0;
+
                 ret = cm->fuel_gauge->get_property(cm->fuel_gauge,
                                 POWER_SUPPLY_PROP_CAPACITY, &val);
-                if (!ret && val.intval >= desc->fullbatt_soc) {
-                        val.intval = 1;
-                        goto out;
-                }
+                if (!ret && val.intval >= desc->fullbatt_soc)
+                        return true;
         }
 
-        val.intval = 0;
-
-out:
-        return val.intval ? true : false;
+        return false;
 }
 
 /**
@@ -489,8 +482,9 @@ static void fullbatt_vchk(struct work_struct *work)
                 return;
         }
 
-        diff = desc->fullbatt_uV;
-        diff -= batt_uV;
+        diff = desc->fullbatt_uV - batt_uV;
+        if (diff < 0)
+                return;
 
         dev_info(cm->dev, "VBATT dropped %duV after full-batt.\n", diff);