diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-19 17:04:36 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-19 17:04:35 -0800 |
| commit | f5145b90f3eddfad36c041b2aac400c202a1be9e (patch) | |
| tree | 97d8f3c3b48c36ce3d3e98bc204a3d1c739b5447 /drivers/power | |
| parent | 8778c16b56f7af30a29a2517d585e2970e9f945d (diff) | |
| parent | 7210624955249fb4fb936b2ca18ee9bab670fdeb (diff) | |
Merge "smb-lib: report FULL regardless of charger presence"
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/qcom-charger/smb-lib.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/power/qcom-charger/smb-lib.c b/drivers/power/qcom-charger/smb-lib.c index ad2d3ac86eac..9348091ec8dd 100644 --- a/drivers/power/qcom-charger/smb-lib.c +++ b/drivers/power/qcom-charger/smb-lib.c @@ -1145,32 +1145,9 @@ int smblib_get_prop_batt_capacity(struct smb_charger *chg, int smblib_get_prop_batt_status(struct smb_charger *chg, union power_supply_propval *val) { - union power_supply_propval pval = {0, }; - bool usb_online, dc_online; u8 stat; int rc; - rc = smblib_get_prop_usb_online(chg, &pval); - if (rc < 0) { - smblib_err(chg, "Couldn't get usb online property rc=%d\n", - rc); - return rc; - } - usb_online = (bool)pval.intval; - - rc = smblib_get_prop_dc_online(chg, &pval); - if (rc < 0) { - smblib_err(chg, "Couldn't get dc online property rc=%d\n", - rc); - return rc; - } - dc_online = (bool)pval.intval; - - if (!usb_online && !dc_online) { - val->intval = POWER_SUPPLY_STATUS_DISCHARGING; - return rc; - } - rc = smblib_read(chg, BATTERY_CHARGER_STATUS_1_REG, &stat); if (rc < 0) { smblib_err(chg, "Couldn't read BATTERY_CHARGER_STATUS_1 rc=%d\n", |