charger: Rename enum charge_state to led_pwr_state

This name is confusing, since its members start with PWR_ and the
comment for enum charge_state_v2 says that these values are only used
to control the LEDs, with one not-quite-correct exception, whatever
that might be.

We could rename it to power_state, but that is already fairly widely
used as a variable in the code base. Also it seems better to match the
enum PWR_ prefix. Future work may rename the members too.

Rename the charge_state enum.

This makes no functional change.

BUG=b:218332694
TEST=make buildall

Change-Id: If8a7cc73dcfb4c1e89984e57fc55e432416e8aec
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4516187
Commit-Queue: Simon Glass <sjg@chromium.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>

14 files changed, 20 insertions, 20 deletions

diff --git a/board/asurada/led.c b/board/asurada/led.c
index ca29f0be45..347f526f88 100644
--- a/board/asurada/led.c
+++ b/board/asurada/led.c
@@ -143,7 +143,7 @@ int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
 static void update_led(enum ec_led_id led_id, bool is_active_charge_port,
 		       int duty, int tick)
 {
-	enum charge_state power_state = charge_get_state();
+	enum led_pwr_state power_state = charge_get_state();
 
 	if (power_state == PWR_STATE_IDLE) {
 		/* Factory mode: blinking white (2sec on + 2sec off) */
diff --git a/board/eve/led.c b/board/eve/led.c
index e3dd8c09c4..2b76a15894 100644
--- a/board/eve/led.c
+++ b/board/eve/led.c
@@ -486,7 +486,7 @@ static enum led_pattern led_get_double_tap_pattern(int percent_chg)
 
 static void led_select_pattern(enum led_pattern *pattern_desired, int tap)
 {
-	enum charge_state chg_state = charge_get_state();
+	enum led_pwr_state chg_state = charge_get_state();
 	int side;
 	int percent_chg;
 	enum led_pattern new_pattern;
diff --git a/board/kakadu/led.c b/board/kakadu/led.c
index 26e1ea22bb..87070bd7af 100644
--- a/board/kakadu/led.c
+++ b/board/kakadu/led.c
@@ -26,7 +26,7 @@ const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
 
 static void kakadu_led_set_battery(void)
 {
-	enum charge_state chstate;
+	enum led_pwr_state chstate;
 	enum power_state powerstate;
 	static uint8_t prv_white, prv_amber;
 	static uint8_t time_cnt;
diff --git a/board/katsu/led.c b/board/katsu/led.c
index 3ce9466613..b925f72574 100644
--- a/board/katsu/led.c
+++ b/board/katsu/led.c
@@ -26,7 +26,7 @@ const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
 
 static void katsu_led_set_battery(void)
 {
-	enum charge_state chstate;
+	enum led_pwr_state chstate;
 	enum power_state powerstate;
 	static uint8_t prv_white, prv_amber;
 	static uint8_t time_cnt;
diff --git a/board/kukui/led.c b/board/kukui/led.c
index 9cfdf855be..f5ddae5c77 100644
--- a/board/kukui/led.c
+++ b/board/kukui/led.c
@@ -15,7 +15,7 @@ const enum ec_led_id supported_led_ids[] = { EC_LED_ID_BATTERY_LED };
 
 const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
 
-static enum charge_state prv_chstate = PWR_STATE_INIT;
+static enum led_pwr_state prv_chstate = PWR_STATE_INIT;
 
 #define LED_OFF MT6370_LED_ID_OFF
 #define LED_RED MT6370_LED_ID1
@@ -29,7 +29,7 @@ static enum charge_state prv_chstate = PWR_STATE_INIT;
 
 static void kukui_led_set_battery(void)
 {
-	enum charge_state chstate;
+	enum led_pwr_state chstate;
 	static uint8_t prv_r, prv_g, prv_b;
 	uint8_t br[EC_LED_COLOR_COUNT] = { 0 };
 
diff --git a/board/nami/led.c b/board/nami/led.c
index a92302b860..53f6bccd07 100644
--- a/board/nami/led.c
+++ b/board/nami/led.c
@@ -504,7 +504,7 @@ void config_leds(enum led_charge_state charge)
 static void call_handler(void)
 {
 	int soc;
-	enum charge_state cs;
+	enum led_pwr_state cs;
 
 	if (!led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED))
 		return;
diff --git a/board/nautilus/led.c b/board/nautilus/led.c
index 3fab136610..f000d79ec8 100644
--- a/board/nautilus/led.c
+++ b/board/nautilus/led.c
@@ -70,7 +70,7 @@ static void nautilus_led_set_power_battery(void)
 {
 	static unsigned int power_ticks;
 	enum led_color cur_led_color = LED_RED;
-	enum charge_state chg_state = charge_get_state();
+	enum led_pwr_state chg_state = charge_get_state();
 	int charge_percent = charge_get_percent();
 
 	if (chipset_in_state(CHIPSET_STATE_ON)) {
diff --git a/board/rammus/led.c b/board/rammus/led.c
index 5ae415a61a..2a4877b6b1 100644
--- a/board/rammus/led.c
+++ b/board/rammus/led.c
@@ -123,7 +123,7 @@ static void rammus_led_set_power(void)
 
 static void rammus_led_set_battery(void)
 {
-	enum charge_state chg_state = charge_get_state();
+	enum led_pwr_state chg_state = charge_get_state();
 	int charge_percent = charge_get_percent();
 	static unsigned int charge_ticks;
 
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c
index 87ae8d2533..72caa44d40 100644
--- a/common/charge_state_v2.c
+++ b/common/charge_state_v2.c
@@ -1737,7 +1737,7 @@ static int battery_near_full(void)
 	return 1;
 }
 
-enum charge_state charge_get_state(void)
+enum led_pwr_state charge_get_state(void)
 {
 	uint32_t chflags;
 
diff --git a/common/led_pwm.c b/common/led_pwm.c
index 4f7297d003..b4d590bdf2 100644
--- a/common/led_pwm.c
+++ b/common/led_pwm.c
@@ -168,7 +168,7 @@ static void pulse_leds(enum ec_led_colors color, int ontime, int period)
 #ifdef CONFIG_BATTERY
 static int show_charge_state(void)
 {
-	enum charge_state chg_st = charge_get_state();
+	enum led_pwr_state chg_st = charge_get_state();
 
 	/*
 	 * The colors listed below are the default, but can be overridden.
diff --git a/include/charge_state.h b/include/charge_state.h
index dcf3430954..6d9c1d5b19 100644
--- a/include/charge_state.h
+++ b/include/charge_state.h
@@ -26,7 +26,7 @@
 #endif
 
 /* Power states */
-enum charge_state {
+enum led_pwr_state {
 	/* Meta-state; unchanged from previous time through task loop */
 	PWR_STATE_UNCHANGE = 0,
 	/* Initializing charge state machine at boot */
@@ -61,7 +61,7 @@ enum charge_state {
 /* Battery is responsive */
 #define CHARGE_FLAG_BATT_RESPONSIVE BIT(2)
 
-/* Debugging constants, in the same order as enum charge_state. This string
+/* Debugging constants, in the same order as enum led_pwr_state. This string
  * table was moved here to sync with enum above.
  */
 #define CHARGE_STATE_NAME_TABLE                                             \
@@ -75,7 +75,7 @@ enum charge_state {
 /**
  * Return current charge state.
  */
-enum charge_state charge_get_state(void);
+enum led_pwr_state charge_get_state(void);
 
 /**
  * Return current charge v2 state.
diff --git a/test/sbs_charging_v2.c b/test/sbs_charging_v2.c
index f47e349672..0b12aea739 100644
--- a/test/sbs_charging_v2.c
+++ b/test/sbs_charging_v2.c
@@ -124,7 +124,7 @@ enum ec_status charger_profile_override_set_param(uint32_t param,
 
 test_static int wait_charging_state(void)
 {
-	enum charge_state state;
+	enum led_pwr_state state;
 	task_wake(TASK_ID_CHARGER);
 	msleep(WAIT_CHARGER_TASK);
 	state = charge_get_state();
@@ -206,7 +206,7 @@ test_static void ev_clear(int event)
 
 test_static int test_charge_state(void)
 {
-	enum charge_state state;
+	enum led_pwr_state state;
 	uint32_t flags;
 
 	/* On AC */
@@ -519,7 +519,7 @@ test_static int test_external_funcs(void)
 #define CHG_OPT2 0x4000
 test_static int test_hc_charge_state(void)
 {
-	enum charge_state state;
+	enum led_pwr_state state;
 	int i, rv, tmp;
 	struct ec_params_charge_state params;
 	struct ec_response_charge_state resp;
diff --git a/zephyr/program/intelrvp/src/intel_rvp_led.c b/zephyr/program/intelrvp/src/intel_rvp_led.c
index 0e4d872963..22de04601b 100644
--- a/zephyr/program/intelrvp/src/intel_rvp_led.c
+++ b/zephyr/program/intelrvp/src/intel_rvp_led.c
@@ -80,7 +80,7 @@ static void pulse_leds(enum pwm_led_id id, int period)
 
 static void update_charger_led(enum pwm_led_id id)
 {
-	enum charge_state chg_st = charge_get_state();
+	enum led_pwr_state chg_st = charge_get_state();
 
 	/*
 	 * The colors listed below are the default, but can be overridden.
diff --git a/zephyr/shim/src/led_driver/led.c b/zephyr/shim/src/led_driver/led.c
index da648a4636..6833ef4372 100644
--- a/zephyr/shim/src/led_driver/led.c
+++ b/zephyr/shim/src/led_driver/led.c
@@ -61,7 +61,7 @@ DT_FOREACH_CHILD_STATUS_OKAY_VARGS(
 #define MAX_COLOR 4
 
 struct node_prop_t {
-	enum charge_state pwr_state;
+	enum led_pwr_state pwr_state;
 	enum power_state chipset_state;
 	int batt_state_mask;
 	int batt_state;
@@ -202,7 +202,7 @@ static int match_node(int node_idx)
 {
 	/* Check if this node depends on power state */
 	if (node_array[node_idx].pwr_state != PWR_STATE_UNCHANGE) {
-		enum charge_state pwr_state = charge_get_state();
+		enum led_pwr_state pwr_state = charge_get_state();
 
 		if (node_array[node_idx].pwr_state != pwr_state)
 			return -1;