charger: Rename enum charge_state_v2 to charge_state

Now that we don't have an old charge_state, this is the only one.
Rename it accordingly.

This makes no functional change.

BUG=b:218332694
TEST=make buildall

Change-Id: I95923eedd2715b8c7793df8f6e3171c82f9347ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4516193
Reviewed-by: Tristan Honscheid <honscheid@google.com>
Tested-by: Simon Glass <sjg@chromium.org>
Commit-Queue: Eric Peers <epeers@google.com>

4 files changed, 23 insertions, 23 deletions

diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c
index a603d4f108..abfb6d2dd0 100644
--- a/common/charge_state_v2.c
+++ b/common/charge_state_v2.c
@@ -80,7 +80,7 @@ static uint8_t battery_level_shutdown;
  */
 static const struct battery_info *batt_info;
 static struct charge_state_data curr;
-static enum charge_state_v2 prev_state;
+static enum charge_state prev_state;
 static int prev_ac, prev_charge, prev_disp_charge;
 static enum battery_present prev_bp;
 static enum ec_charge_control_mode chg_ctl_mode;
@@ -776,7 +776,7 @@ static void notify_host_of_low_battery_charge(void)
 #endif
 }
 
-static void set_charge_state(enum charge_state_v2 state)
+static void set_charge_state(enum charge_state state)
 {
 	prev_state = curr.state;
 	curr.state = state;
@@ -1026,7 +1026,7 @@ static void wakeup_battery(int *need_static)
 	}
 }
 
-__test_only enum charge_state_v2 charge_get_state_v2(void)
+__test_only enum charge_state charge_get_state(void)
 {
 	return curr.state;
 }
diff --git a/include/charge_state.h b/include/charge_state.h
index 34576dc333..ed7ca0a4d9 100644
--- a/include/charge_state.h
+++ b/include/charge_state.h
@@ -83,7 +83,7 @@ enum led_pwr_state {
  * only to control the LEDs (with one not-quite-correct exception). For V2
  * we use a different set of states internally.
  */
-enum charge_state_v2 {
+enum charge_state {
 	ST_IDLE = 0,
 	ST_DISCHARGE,
 	ST_CHARGE,
@@ -98,7 +98,7 @@ struct charge_state_data {
 	int batt_is_charging;
 	struct charger_params chg;
 	struct batt_params batt;
-	enum charge_state_v2 state;
+	enum charge_state state;
 	int requested_voltage;
 	int requested_current;
 	int desired_input_current;
@@ -126,7 +126,7 @@ enum led_pwr_state led_pwr_get_state(void);
 /**
  * Return current charge v2 state.
  */
-__test_only enum charge_state_v2 charge_get_state_v2(void);
+__test_only enum charge_state charge_get_state(void);
 
 /**
  * Return non-zero if battery is so low we want to keep AP off.
diff --git a/test/sbs_charging_v2.c b/test/sbs_charging_v2.c
index 482770ff1c..7c20bbe4ac 100644
--- a/test/sbs_charging_v2.c
+++ b/test/sbs_charging_v2.c
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
- * Test charge_state_v2 behavior
+ * Test charge_state behavior
  */
 
 #include "battery_smart.h"
@@ -367,7 +367,7 @@ test_static int test_low_battery(void)
 
 test_static int test_deep_charge_battery(void)
 {
-	enum charge_state_v2 state_v2;
+	enum charge_state state;
 	const struct battery_info *bat_info = battery_get_info();
 
 	test_setup(1);
@@ -375,22 +375,22 @@ test_static int test_deep_charge_battery(void)
 	/* battery pack voltage bellow voltage_min */
 	sb_write(SB_VOLTAGE, (bat_info->voltage_min - 200));
 	wait_charging_state();
-	state_v2 = charge_get_state_v2();
-	TEST_ASSERT(state_v2 == ST_PRECHARGE);
+	state = charge_get_state();
+	TEST_ASSERT(state == ST_PRECHARGE);
 
 	/*
 	 * Battery voltage keep bellow voltage_min,
 	 * precharge over time CONFIG_BATTERY_LOW_VOLTAGE_TIMEOUT
 	 */
 	usleep(CONFIG_BATTERY_LOW_VOLTAGE_TIMEOUT);
-	state_v2 = charge_get_state_v2();
-	TEST_ASSERT(state_v2 == ST_IDLE);
+	state = charge_get_state();
+	TEST_ASSERT(state == ST_IDLE);
 
 	/* recovery from a low voltage. */
 	sb_write(SB_VOLTAGE, (bat_info->voltage_normal));
 	wait_charging_state();
-	state_v2 = charge_get_state_v2();
-	TEST_ASSERT(state_v2 == ST_CHARGE);
+	state = charge_get_state();
+	TEST_ASSERT(state == ST_CHARGE);
 
 	return EC_SUCCESS;
 }
diff --git a/zephyr/test/drivers/common_charger/src/test_charge_state_v2.c b/zephyr/test/drivers/common_charger/src/test_charge_state_v2.c
index a62ec2b0ea..b900e97661 100644
--- a/zephyr/test/drivers/common_charger/src/test_charge_state_v2.c
+++ b/zephyr/test/drivers/common_charger/src/test_charge_state_v2.c
@@ -12,35 +12,35 @@
 
 int battery_outside_charging_temperature(void);
 
-struct charge_state_v2_fixture {
+struct charge_state_fixture {
 	struct charge_state_data charge_state_data;
 };
 
 static void *setup(void)
 {
-	static struct charge_state_v2_fixture fixture;
+	static struct charge_state_fixture fixture;
 
 	return &fixture;
 }
 
 static void before(void *f)
 {
-	struct charge_state_v2_fixture *fixture = f;
+	struct charge_state_fixture *fixture = f;
 
 	fixture->charge_state_data = *charge_get_status();
 }
 
 static void after(void *f)
 {
-	struct charge_state_v2_fixture *fixture = f;
+	struct charge_state_fixture *fixture = f;
 
 	*charge_get_status() = fixture->charge_state_data;
 }
 
-ZTEST_SUITE(charge_state_v2, drivers_predicate_post_main, setup, before, after,
+ZTEST_SUITE(charge_state, drivers_predicate_post_main, setup, before, after,
 	    NULL);
 
-ZTEST(charge_state_v2, test_battery_flag_bad_temperature)
+ZTEST(charge_state, test_battery_flag_bad_temperature)
 {
 	struct charge_state_data *curr = charge_get_status();
 
@@ -48,7 +48,7 @@ ZTEST(charge_state_v2, test_battery_flag_bad_temperature)
 	zassert_ok(battery_outside_charging_temperature());
 }
 
-ZTEST(charge_state_v2, test_battery_temperature_range)
+ZTEST(charge_state, test_battery_temperature_range)
 {
 	struct charge_state_data *curr = charge_get_status();
 	const struct battery_info *batt_info = battery_get_info();
@@ -98,7 +98,7 @@ ZTEST(charge_state_v2, test_battery_temperature_range)
 	zassert_ok(battery_outside_charging_temperature());
 }
 
-ZTEST(charge_state_v2, test_current_limit_derating)
+ZTEST(charge_state, test_current_limit_derating)
 {
 	int charger_current_limit;
 
@@ -115,7 +115,7 @@ ZTEST(charge_state_v2, test_current_limit_derating)
 		charger_current_limit);
 }
 
-ZTEST(charge_state_v2, test_minimum_current_limit)
+ZTEST(charge_state, test_minimum_current_limit)
 {
 	int charger_current_limit;