diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2021-05-28 13:20:38 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-07-05 19:17:01 +0000 |
| commit | 24da17a6b9539a10e5d3fe6b9ad384802e04ea62 (patch) | |
| tree | 92cd271b7533358831f407bcc5414e121e375529 /common | |
| parent | 23a542566b89d5f00dbd3f5442e63f6d0cbf7477 (diff) | |
| download | chrome-ec-24da17a6b9539a10e5d3fe6b9ad384802e04ea62.tar.gz | |
chgstv2: Clean up CONFIG_BATTERY_CHECK_CHARGE_TEMP_LIMITS
This patch cleans up the code around
CONFIG_BATTERY_CHECK_CHARGE_TEMP_LIMITS. There is no functional
change.
BUG=None
BRANCH=None
TEST=buildall
Change-Id: Ib3757a802532ea669af27579d33c24bf9794d0b2
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2929345
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/charge_state_v2.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index 17bd7b375e..1cfda9f363 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -1688,7 +1688,6 @@ const struct batt_params *charger_current_battery_params(void) return &curr.batt; } -#ifdef CONFIG_BATTERY_CHECK_CHARGE_TEMP_LIMITS /* Determine if the battery is outside of allowable temperature range */ static int battery_outside_charging_temperature(void) { @@ -1716,7 +1715,6 @@ static int battery_outside_charging_temperature(void) } return 0; } -#endif static void sustain_battery_soc(void) { @@ -2147,15 +2145,14 @@ wait_for_it: } #endif -#ifdef CONFIG_BATTERY_CHECK_CHARGE_TEMP_LIMITS - if (battery_outside_charging_temperature()) { + if (IS_ENABLED(CONFIG_BATTERY_CHECK_CHARGE_TEMP_LIMITS) + && battery_outside_charging_temperature()) { curr.requested_current = 0; curr.requested_voltage = 0; curr.batt.flags &= ~BATT_FLAG_WANT_CHARGE; if (curr.state != ST_DISCHARGE) curr.state = ST_IDLE; } -#endif #ifdef CONFIG_CHARGE_MANAGER if (curr.batt.state_of_charge >= |