diff options
| author | Eric Yilun Lin <yllin@chromium.org> | 2020-10-29 15:14:59 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-12-08 06:28:42 +0000 |
| commit | a94624f1a2fa5c25c810fef5ef66012218ed177d (patch) | |
| tree | 148c9274885b67be96931cb3439115b080ab528d /common/charge_state_v2.c | |
| parent | 4761e94ef6690c47a25351d024705197674720bd (diff) | |
| download | chrome-ec-a94624f1a2fa5c25c810fef5ef66012218ed177d.tar.gz | |
charger: rename charger_set_input_current
charger_set_input_current was actually sets the input current limit,
so renames it to charger_set_input_current_limit.
BUG=b:171853295
TEST=make buildall
TEST=not output from `grep -r "\<charger_set_input_current\>"`
BRANCH=none
Change-Id: Icf4e99f287a7d4fc2d9560e8502e46cc07bfc085
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2569083
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'common/charge_state_v2.c')
| -rw-r--r-- | common/charge_state_v2.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index af5a996706..ecce4fbdb2 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -417,7 +417,7 @@ static void set_base_lid_current(int current_base, int allow_charge_base, ret = charge_set_output_current_limit(CHARGER_SOLO, 0, 0); if (ret) return; - ret = charger_set_input_current(chgnum, current_lid); + ret = charger_set_input_current_limit(chgnum, current_lid); if (ret) return; if (allow_charge_lid) @@ -1736,19 +1736,20 @@ void charger_task(void *u) * Try again if it fails. */ int rv = charger_post_init(); + if (rv != EC_SUCCESS) { problem(PR_POST_INIT, rv); - } else { - if (curr.desired_input_current != - CHARGE_CURRENT_UNINITIALIZED) - rv = charger_set_input_current( - chgnum, - curr.desired_input_current); + } else if (curr.desired_input_current != + CHARGE_CURRENT_UNINITIALIZED) { + rv = charger_set_input_current_limit( + chgnum, + curr.desired_input_current); if (rv != EC_SUCCESS) problem(PR_SET_INPUT_CURR, rv); - else - prev_ac = curr.ac; } + + if (rv == EC_SUCCESS) + prev_ac = curr.ac; } else { /* Some things are only meaningful on AC */ chg_ctl_mode = CHARGE_CONTROL_NORMAL; @@ -1779,7 +1780,7 @@ void charger_task(void *u) get_desired_input_current(prev_bp, info); if (curr.desired_input_current != CHARGE_CURRENT_UNINITIALIZED) - charger_set_input_current(chgnum, + charger_set_input_current_limit(chgnum, curr.desired_input_current); hook_notify(HOOK_BATTERY_SOC_CHANGE); } @@ -2491,7 +2492,7 @@ int charge_set_input_current_limit(int ma, int mv) charge_wakeup(); return EC_SUCCESS; #else - return charger_set_input_current(chgnum, ma); + return charger_set_input_current_limit(chgnum, ma); #endif } @@ -2718,7 +2719,8 @@ charge_command_charge_state(struct host_cmd_handler_args *args) chgstate_set_manual_current(val); break; case CS_PARAM_CHG_INPUT_CURRENT: - if (charger_set_input_current(chgnum, val)) + if (charger_set_input_current_limit(chgnum, + val)) rv = EC_RES_ERROR; break; case CS_PARAM_CHG_STATUS: |