summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-07-13 15:45:24 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-07-13 15:45:24 -0700
commitdd6f2cf39a0574355befe64ad8dced1f6a38f1bc (patch)
tree7a56d2bd96e20f5e50093e96af38c88fae174917
parent2197cb0f60dbc010dc27490aa406e30a24ea9470 (diff)
parenta81e7206ec5592375f7d0effc2853a47dd0ee509 (diff)
Merge "qcom-charger: smb-lib: fix battery health status"
-rw-r--r--drivers/power/qcom-charger/smb-lib.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/power/qcom-charger/smb-lib.c b/drivers/power/qcom-charger/smb-lib.c
index 0465bfac296d..a7bda329cadd 100644
--- a/drivers/power/qcom-charger/smb-lib.c
+++ b/drivers/power/qcom-charger/smb-lib.c
@@ -783,22 +783,16 @@ int smblib_get_prop_batt_health(struct smb_charger *chg,
goto done;
}
- switch (stat & BAT_TEMP_STATUS_MASK) {
- case BAT_TEMP_STATUS_TOO_COLD_BIT:
+ if (stat & BAT_TEMP_STATUS_TOO_COLD_BIT)
val->intval = POWER_SUPPLY_HEALTH_COLD;
- break;
- case BAT_TEMP_STATUS_TOO_HOT_BIT:
+ else if (stat & BAT_TEMP_STATUS_TOO_HOT_BIT)
val->intval = POWER_SUPPLY_HEALTH_OVERHEAT;
- break;
- case BAT_TEMP_STATUS_COLD_SOFT_LIMIT_BIT:
+ else if (stat & BAT_TEMP_STATUS_COLD_SOFT_LIMIT_BIT)
val->intval = POWER_SUPPLY_HEALTH_COOL;
- break;
- case BAT_TEMP_STATUS_HOT_SOFT_LIMIT_BIT:
+ else if (stat & BAT_TEMP_STATUS_HOT_SOFT_LIMIT_BIT)
val->intval = POWER_SUPPLY_HEALTH_WARM;
- break;
- default:
+ else
val->intval = POWER_SUPPLY_HEALTH_GOOD;
- }
done:
return rc;