diff options
| author | Simon Glass <sjg@chromium.org> | 2023-05-09 13:08:48 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-05-09 23:44:01 +0000 |
| commit | 7f381db1790b9593d6ae46c163e8df53ba1eb03f (patch) | |
| tree | be988ba375414dfdcbdfdb080500e6eb80e10121 | |
| parent | 7540daff3f1d60e2193e5cb7d86ba2f8769520da (diff) | |
| download | chrome-ec-7f381db1790b9593d6ae46c163e8df53ba1eb03f.tar.gz | |
charger: Move conditional into process_preferred_voltage()
Try to work around the code-coverage loss by moving the condition into
the function.
BUG=b:281109948
TEST=check if coverage goes back up
Change-Id: I3374692c7010f3712e87a2e144212488fb58bb91
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4519108
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | common/charge_state_v2.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index 404983d4e8..87ae8d2533 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -1386,12 +1386,20 @@ static void adjust_requested_vi(const struct charger_info *const info, /* Handle selection of the preferred voltage */ static void process_preferred_voltage(void) { - int is_pd_supply = charge_manager_get_supplier() == CHARGE_SUPPLIER_PD; - int port = charge_manager_get_active_charge_port(); - int bat_spec_desired_mw = - curr.batt.desired_current * curr.batt.desired_voltage / 1000; + int is_pd_supply; + int port; + int bat_spec_desired_mw; int prev_plt_and_desired_mw; + /* sjg@: Attempt to get code coverage on this function b/281109948 */ + if (!IS_ENABLED(CONFIG_USB_PD_PREFER_MV)) + return; + + is_pd_supply = charge_manager_get_supplier() == CHARGE_SUPPLIER_PD; + port = charge_manager_get_active_charge_port(); + bat_spec_desired_mw = + curr.batt.desired_current * curr.batt.desired_voltage / 1000; + /* save previous plt_and_desired_mw, since it will be updated below */ prev_plt_and_desired_mw = charge_get_plt_plus_bat_desired_mw(); @@ -1585,8 +1593,7 @@ void charger_task(void *u) adjust_requested_vi(info, is_full); - if (IS_ENABLED(CONFIG_USB_PD_PREFER_MV)) - process_preferred_voltage(); + process_preferred_voltage(); /* Report our state */ local_state.is_full = is_full; |