diff options
author | Simon Glass <sjg@chromium.org> | 2023-05-08 15:33:31 -0600 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-05-11 14:04:30 +0000 |
commit | b729eab7c75553c830b54be5da7a348127f0b49c (patch) | |
tree | db654291e97be430144d4bcad27e4f04db9f87f7 /zephyr/test/drivers/default | |
parent | c1b39d008cf6aa8ed53780c5b4ff1bd55951d1b4 (diff) | |
download | chrome-ec-b729eab7c75553c830b54be5da7a348127f0b49c.tar.gz |
charger: Move charger_state_v2.h into charge_state.h
We don't have a v1 anymore, so the name makes no sense. Move it into
the existing file.
Include charge_state.h instead of v2, doing this in the same change to
avoid build errors.
This makes no functional change.
BUG=b:218332694
TEST=make buildall
Change-Id: Ic3e3adc45e4d002c2cd5ba8aa65e24686e01d628
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4516191
Reviewed-by: Tim Van Patten <timvp@google.com>
Commit-Queue: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Yuval Peress <peress@google.com>
Diffstat (limited to 'zephyr/test/drivers/default')
-rw-r--r-- | zephyr/test/drivers/default/src/charge_state_prevent_power_on.c | 1 | ||||
-rw-r--r-- | zephyr/test/drivers/default/src/console_cmd/charge_state.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/zephyr/test/drivers/default/src/charge_state_prevent_power_on.c b/zephyr/test/drivers/default/src/charge_state_prevent_power_on.c index ce47ff8042..07e15ea1f6 100644 --- a/zephyr/test/drivers/default/src/charge_state_prevent_power_on.c +++ b/zephyr/test/drivers/default/src/charge_state_prevent_power_on.c @@ -4,7 +4,6 @@ */ #include "charge_state.h" -#include "charge_state_v2.h" #include "test/drivers/test_state.h" #include <zephyr/ztest.h> diff --git a/zephyr/test/drivers/default/src/console_cmd/charge_state.c b/zephyr/test/drivers/default/src/console_cmd/charge_state.c index 8cfd11324f..851725af36 100644 --- a/zephyr/test/drivers/default/src/console_cmd/charge_state.c +++ b/zephyr/test/drivers/default/src/console_cmd/charge_state.c @@ -4,7 +4,6 @@ */ #include "charge_state.h" -#include "charge_state_v2.h" #include "console.h" #include "ec_commands.h" #include "test/drivers/test_state.h" |