summaryrefslogtreecommitdiff
path: root/drivers/power/qpnp-fg.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/power/qpnp-fg.c')
-rw-r--r--drivers/power/qpnp-fg.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/power/qpnp-fg.c b/drivers/power/qpnp-fg.c
index 160aceb1eac7..a996a2b41f3e 100644
--- a/drivers/power/qpnp-fg.c
+++ b/drivers/power/qpnp-fg.c
@@ -2503,9 +2503,7 @@ static int estimate_battery_age(struct fg_chip *chip, int *actual_capacity)
}
battery_soc = get_battery_soc_raw(chip) * 100 / FULL_PERCENT_3B;
- if (rc) {
- goto error_done;
- } else if (battery_soc < 25 || battery_soc > 75) {
+ if (battery_soc < 25 || battery_soc > 75) {
if (fg_debug_mask & FG_AGING)
pr_info("Battery SoC (%d) out of range, aborting\n",
(int)battery_soc);
@@ -6115,7 +6113,6 @@ static int fg_hw_init(struct fg_chip *chip)
static int fg_setup_memif_offset(struct fg_chip *chip)
{
int rc;
- u8 dig_major;
rc = fg_read(chip, chip->revision, chip->mem_base + DIG_MINOR, 4);
if (rc) {
@@ -6133,7 +6130,8 @@ static int fg_setup_memif_offset(struct fg_chip *chip)
chip->ima_supported = true;
break;
default:
- pr_err("Digital Major rev=%d not supported\n", dig_major);
+ pr_err("Digital Major rev=%d not supported\n",
+ chip->revision[DIG_MAJOR]);
return -EINVAL;
}