evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "qcom-charger: qpnp-fg-gen3: remove wakelock when reading SRAM props"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-13 23:13:03 -07:00 • committed by Gerrit - the friendly Code Review server
commit 06a047a77f
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/power/qcom-charger/fg-core.h
View file

@ -40,7 +40,6 @@
#define SRAM_READ "fg_sram_read"
#define SRAM_WRITE "fg_sram_write"
#define SRAM_UPDATE "fg_sram_update"
#define PROFILE_LOAD "fg_profile_load"
#define DELTA_SOC "fg_delta_soc"

6
drivers/power/qcom-charger/qpnp-fg-gen3.c
View file

@ -413,13 +413,12 @@ static int fg_get_sram_prop(struct fg_chip *chip, enum fg_sram_param_id id,
if (id < 0 || id > FG_SRAM_MAX || chip->sp[id].len > sizeof(buf))
return -EINVAL;
vote(chip->awake_votable, SRAM_UPDATE, true, 0);
rc = fg_sram_read(chip, chip->sp[id].address, chip->sp[id].offset,
buf, chip->sp[id].len, FG_IMA_DEFAULT);
if (rc < 0) {
pr_err("Error reading address 0x%04x[%d] rc=%d\n",
chip->sp[id].address, chip->sp[id].offset, rc);
goto out;
return rc;
}
for (i = 0, temp = 0; i < chip->sp[id].len; i++)
@ -427,9 +426,6 @@ static int fg_get_sram_prop(struct fg_chip *chip, enum fg_sram_param_id id,
*val = fg_decode(chip->sp, id, temp);
return 0;
out:
vote(chip->awake_votable, SRAM_UPDATE, false, 0);
return rc;
}
#define BATT_TEMP_NUMR 1