charger: Rename charge_get_state() to led_pwr_get_state()

We have a new 'charge state' in struct charge_state_data as part of the
charge_state_v2.h file. This is confusing.

Rename this function to match the enum it is referencing.

This makes no functional change.

BUG=b:218332694
TEST=make buildall

Change-Id: I7f08dd4fb11e2939e0ef779018c1e3206ebc8d20
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4516188
Commit-Queue: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Aaron Massey <aaronmassey@google.com>

75 files changed, 101 insertions, 101 deletions

diff --git a/baseboard/intelrvp/led_states.c b/baseboard/intelrvp/led_states.c
index 6bcee159a3..bee35a85a2 100644
--- a/baseboard/intelrvp/led_states.c
+++ b/baseboard/intelrvp/led_states.c
@@ -22,7 +22,7 @@ static enum led_states led_get_state(void)
 	int charge_lvl;
 	enum led_states new_state = LED_NUM_STATES;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Get percent charge */
 		charge_lvl = charge_get_percent();
@@ -115,7 +115,7 @@ static void led_update_battery(void)
 static enum pwr_led_states pwr_led_get_state(void)
 {
 	if (extpower_is_present()) {
-		if (charge_get_state() == PWR_STATE_CHARGE_NEAR_FULL)
+		if (led_pwr_get_state() == PWR_STATE_CHARGE_NEAR_FULL)
 			return PWR_LED_STATE_OFF;
 		else
 			return PWR_LED_STATE_ON;
diff --git a/board/agah/led.c b/board/agah/led.c
index d5b27f128d..e92b369e68 100644
--- a/board/agah/led.c
+++ b/board/agah/led.c
@@ -112,7 +112,7 @@ static void led_set_battery(void)
 	battery_ticks++;
 
 	if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND) &&
-	    charge_get_state() != PWR_STATE_CHARGE) {
+	    led_pwr_get_state() != PWR_STATE_CHARGE) {
 		suspend_ticks++;
 
 		led_set_color_battery(
@@ -123,7 +123,7 @@ static void led_set_battery(void)
 		return;
 	}
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/anahera/led.c b/board/anahera/led.c
index 1d76fc342d..205bf5a713 100644
--- a/board/anahera/led.c
+++ b/board/anahera/led.c
@@ -136,7 +136,7 @@ static void led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/asurada/led.c b/board/asurada/led.c
index 347f526f88..e793e6ff13 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 led_pwr_state power_state = charge_get_state();
+	enum led_pwr_state power_state = led_pwr_get_state();
 
 	if (power_state == PWR_STATE_IDLE) {
 		/* Factory mode: blinking white (2sec on + 2sec off) */
diff --git a/board/banshee/led.c b/board/banshee/led.c
index f0ea78cab2..15df2be5db 100644
--- a/board/banshee/led.c
+++ b/board/banshee/led.c
@@ -252,9 +252,9 @@ static int led_get_charge_percent(void)
 
 static void select_active_port_led(int port)
 {
-	if ((charge_get_state() == PWR_STATE_DISCHARGE &&
+	if ((led_pwr_get_state() == PWR_STATE_DISCHARGE &&
 	     led_get_charge_percent() < 10) ||
-	    charge_get_state() == PWR_STATE_ERROR) {
+	    led_pwr_get_state() == PWR_STATE_ERROR) {
 		gpio_set_level(GPIO_LEFT_SIDE, 1);
 		gpio_set_level(GPIO_RIGHT_SIDE, 1);
 	} else if (port == RIGHT_PORT) {
@@ -299,7 +299,7 @@ static void led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(EC_LED_COLOR_AMBER);
diff --git a/board/beadrix/led.c b/board/beadrix/led.c
index 8bef7c0bd9..56b8b736e5 100644
--- a/board/beadrix/led.c
+++ b/board/beadrix/led.c
@@ -66,7 +66,7 @@ static void board_led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate amber on when charging. */
 		color = LED_RED;
diff --git a/board/berknip/led.c b/board/berknip/led.c
index c2b0e69cbb..17ad80fa40 100644
--- a/board/berknip/led.c
+++ b/board/berknip/led.c
@@ -138,7 +138,7 @@ static void led_set_battery(void)
 	 * system suspend with non-charging state.
 	 */
 	if (chipset_in_state(CHIPSET_STATE_SUSPEND | CHIPSET_STATE_STANDBY) &&
-	    charge_get_state() != PWR_STATE_CHARGE) {
+	    led_pwr_get_state() != PWR_STATE_CHARGE) {
 		power_ticks++;
 
 		led_set_color_battery(RIGHT_PORT,
@@ -156,7 +156,7 @@ static void led_set_battery(void)
 
 	power_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/bloog/led.c b/board/bloog/led.c
index c11244b613..6a1b85712b 100644
--- a/board/bloog/led.c
+++ b/board/bloog/led.c
@@ -139,7 +139,7 @@ static void led_set_battery(void)
 	if (!board_is_convertible()) {
 		if (chipset_in_state(CHIPSET_STATE_SUSPEND |
 				     CHIPSET_STATE_STANDBY) &&
-		    charge_get_state() != PWR_STATE_CHARGE) {
+		    led_pwr_get_state() != PWR_STATE_CHARGE) {
 			power_ticks++;
 
 			led_set_color_battery(0, power_ticks & 0x4 ? LED_WHITE :
@@ -152,7 +152,7 @@ static void led_set_battery(void)
 
 	power_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/burnet/led.c b/board/burnet/led.c
index 68c4c9e839..750b3a217d 100644
--- a/board/burnet/led.c
+++ b/board/burnet/led.c
@@ -129,7 +129,7 @@ static void led_set_battery(void)
 	if (!board_is_convertible()) {
 		if (chipset_in_state(CHIPSET_STATE_SUSPEND |
 				     CHIPSET_STATE_STANDBY) &&
-		    charge_get_state() != PWR_STATE_CHARGE) {
+		    led_pwr_get_state() != PWR_STATE_CHARGE) {
 			led_set_color_battery(power_ticks++ & 0x2 ? LED_WHITE :
 								    LED_OFF);
 			return;
@@ -138,7 +138,7 @@ static void led_set_battery(void)
 
 	power_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		led_set_color_battery(LED_AMBER);
 		break;
diff --git a/board/careena/led.c b/board/careena/led.c
index fda7503974..c0f111ac4d 100644
--- a/board/careena/led.c
+++ b/board/careena/led.c
@@ -93,7 +93,7 @@ static void led_set_battery(void)
 
 	/* override battery led for system suspend */
 	if (chipset_in_state(CHIPSET_STATE_SUSPEND | CHIPSET_STATE_STANDBY) &&
-	    charge_get_state() != PWR_STATE_CHARGE) {
+	    led_pwr_get_state() != PWR_STATE_CHARGE) {
 		led_set_color_battery(power_ticks++ & 0x4 ? LED_WHITE :
 							    LED_OFF);
 		return;
@@ -101,7 +101,7 @@ static void led_set_battery(void)
 
 	power_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		led_set_color_battery(LED_AMBER);
 		break;
diff --git a/board/chronicler/led.c b/board/chronicler/led.c
index fd5308f09d..7566c7b633 100644
--- a/board/chronicler/led.c
+++ b/board/chronicler/led.c
@@ -140,7 +140,7 @@ static void led_set_battery(void)
 	 * LEDs to indicate system suspend without charging state.
 	 */
 	if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND) &&
-	    charge_get_state() != PWR_STATE_CHARGE) {
+	    led_pwr_get_state() != PWR_STATE_CHARGE) {
 		suspend_ticks++;
 
 		led_set_color_battery(
@@ -152,7 +152,7 @@ static void led_set_battery(void)
 
 	suspend_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/coachz/led.c b/board/coachz/led.c
index 01873eae3e..61ecc46181 100644
--- a/board/coachz/led.c
+++ b/board/coachz/led.c
@@ -72,7 +72,7 @@ static void board_led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate amber on when charging. */
 		color = LED_AMBER;
diff --git a/board/coral/led.c b/board/coral/led.c
index b8515c14c7..22cbca4fa2 100644
--- a/board/coral/led.c
+++ b/board/coral/led.c
@@ -174,7 +174,7 @@ static enum led_states led_get_state(void)
 	int charge_lvl;
 	enum led_states new_state = LED_NUM_STATES;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Get percent charge */
 		charge_lvl = charge_get_percent();
diff --git a/board/corori/led.c b/board/corori/led.c
index f47871a4ed..da32dfa7f8 100644
--- a/board/corori/led.c
+++ b/board/corori/led.c
@@ -118,7 +118,7 @@ static enum led_states led_get_state(void)
 {
 	enum led_states new_state = LED_NUM_STATES;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		new_state = STATE_CHARGING;
 		break;
diff --git a/board/crota/led.c b/board/crota/led.c
index 4b4be6fe39..86fc187521 100644
--- a/board/crota/led.c
+++ b/board/crota/led.c
@@ -98,7 +98,7 @@ __override enum led_states board_led_get_state(enum led_states desired_state)
 	/* Make sure when battery is pre-charging, the LED will blinking.
 	 * Otherwise it will wait 30 seconds then blinking.
 	 */
-	if (charge_get_state() == PWR_STATE_IDLE) {
+	if (led_pwr_get_state() == PWR_STATE_IDLE) {
 		if (charge_get_flags() & CHARGE_FLAG_EXTERNAL_POWER)
 			desired_state = STATE_BATTERY_ERROR;
 	}
diff --git a/board/dirinboz/led.c b/board/dirinboz/led.c
index b4063177f4..f50393003d 100644
--- a/board/dirinboz/led.c
+++ b/board/dirinboz/led.c
@@ -142,7 +142,7 @@ static void led_set_battery(void)
 	 * system suspend with non-charging state.
 	 */
 	if (chipset_in_state(CHIPSET_STATE_SUSPEND | CHIPSET_STATE_STANDBY) &&
-	    charge_get_state() != PWR_STATE_CHARGE) {
+	    led_pwr_get_state() != PWR_STATE_CHARGE) {
 		power_ticks++;
 
 		led_set_color_battery(RIGHT_PORT,
@@ -154,7 +154,7 @@ static void led_set_battery(void)
 
 	power_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/dojo/led.c b/board/dojo/led.c
index 4b2b379a1b..f1af389f60 100644
--- a/board/dojo/led.c
+++ b/board/dojo/led.c
@@ -134,7 +134,7 @@ static void board_led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/dratini/led.c b/board/dratini/led.c
index 035bd963d5..16c0699a8e 100644
--- a/board/dratini/led.c
+++ b/board/dratini/led.c
@@ -156,7 +156,7 @@ static void led_set_battery(void)
 	if (!board_is_convertible()) {
 		if (chipset_in_state(CHIPSET_STATE_SUSPEND |
 				     CHIPSET_STATE_STANDBY) &&
-		    charge_get_state() != PWR_STATE_CHARGE) {
+		    led_pwr_get_state() != PWR_STATE_CHARGE) {
 			power_ticks++;
 
 			led_set_color_battery(0, power_ticks & 0x4 ? LED_WHITE :
@@ -169,7 +169,7 @@ static void led_set_battery(void)
 
 	power_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/drawcia/led.c b/board/drawcia/led.c
index 0fee248506..f9b504d13f 100644
--- a/board/drawcia/led.c
+++ b/board/drawcia/led.c
@@ -124,7 +124,7 @@ static void led_set_battery(void)
 	 */
 	if (get_cbi_fw_config_tablet_mode() == TABLET_MODE_ABSENT) {
 		if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND) &&
-		    charge_get_state() != PWR_STATE_CHARGE) {
+		    led_pwr_get_state() != PWR_STATE_CHARGE) {
 			led_set_color_battery(power_ticks++ & 0x2 ? LED_WHITE :
 								    LED_OFF);
 			return;
@@ -133,7 +133,7 @@ static void led_set_battery(void)
 
 	power_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		led_set_color_battery(LED_AMBER);
 		break;
diff --git a/board/drawcia_riscv/led.c b/board/drawcia_riscv/led.c
index d72626b2a2..f53a376a33 100644
--- a/board/drawcia_riscv/led.c
+++ b/board/drawcia_riscv/led.c
@@ -124,7 +124,7 @@ static void led_set_battery(void)
 	 */
 	if (get_cbi_fw_config_tablet_mode() == TABLET_MODE_ABSENT) {
 		if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND) &&
-		    charge_get_state() != PWR_STATE_CHARGE) {
+		    led_pwr_get_state() != PWR_STATE_CHARGE) {
 			led_set_color_battery(power_ticks++ & 0x2 ? LED_WHITE :
 								    LED_OFF);
 			return;
@@ -133,7 +133,7 @@ static void led_set_battery(void)
 
 	power_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		led_set_color_battery(LED_AMBER);
 		break;
diff --git a/board/elemi/led.c b/board/elemi/led.c
index 810b8281db..8ba177a0db 100644
--- a/board/elemi/led.c
+++ b/board/elemi/led.c
@@ -140,7 +140,7 @@ static void led_set_battery(void)
 	 * system suspend without charging state.
 	 */
 	if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND) &&
-	    charge_get_state() != PWR_STATE_CHARGE) {
+	    led_pwr_get_state() != PWR_STATE_CHARGE) {
 		suspend_ticks++;
 
 		led_set_color_battery(
@@ -152,7 +152,7 @@ static void led_set_battery(void)
 
 	suspend_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/elm/led.c b/board/elm/led.c
index 211d1b2bbf..06de348884 100644
--- a/board/elm/led.c
+++ b/board/elm/led.c
@@ -136,7 +136,7 @@ static void elm_led_set_battery(void)
 			     0 :
 			     (1000 * remaining_capacity) / full_charge_capacity;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		if (permillage < FULL_BATTERY_PERMILLAGE) {
 			bat_led_set(BAT_LED_BLUE, 0);
diff --git a/board/eve/led.c b/board/eve/led.c
index 2b76a15894..3a8acff556 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 led_pwr_state chg_state = charge_get_state();
+	enum led_pwr_state chg_state = led_pwr_get_state();
 	int side;
 	int percent_chg;
 	enum led_pattern new_pattern;
diff --git a/board/gelarshie/led.c b/board/gelarshie/led.c
index e8b4dbbd8e..4c84965c41 100644
--- a/board/gelarshie/led.c
+++ b/board/gelarshie/led.c
@@ -72,7 +72,7 @@ static void board_led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate amber on when charging. */
 		color = LED_AMBER;
diff --git a/board/gumboz/led.c b/board/gumboz/led.c
index c90caeec12..a506684a92 100644
--- a/board/gumboz/led.c
+++ b/board/gumboz/led.c
@@ -163,7 +163,7 @@ static void led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/haboki/led.c b/board/haboki/led.c
index c6e481e285..4acc6f708d 100644
--- a/board/haboki/led.c
+++ b/board/haboki/led.c
@@ -124,7 +124,7 @@ static void led_set_battery(void)
 	 */
 	if (get_cbi_fw_config_tablet_mode() == TABLET_MODE_ABSENT) {
 		if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND) &&
-		    charge_get_state() != PWR_STATE_CHARGE) {
+		    led_pwr_get_state() != PWR_STATE_CHARGE) {
 			led_set_color_battery(power_ticks++ & 0x2 ? LED_WHITE :
 								    LED_OFF);
 			return;
@@ -133,7 +133,7 @@ static void led_set_battery(void)
 
 	power_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		led_set_color_battery(LED_AMBER);
 		break;
diff --git a/board/hades/led.c b/board/hades/led.c
index 580c8e1679..c160baa5e8 100644
--- a/board/hades/led.c
+++ b/board/hades/led.c
@@ -120,7 +120,7 @@ static void led_set_battery(void)
 	battery_ticks++;
 
 	if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND) &&
-	    charge_get_state() != PWR_STATE_CHARGE) {
+	    led_pwr_get_state() != PWR_STATE_CHARGE) {
 		suspend_ticks++;
 
 		led_set_color_battery(
@@ -131,7 +131,7 @@ static void led_set_battery(void)
 		return;
 	}
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/herobrine/led.c b/board/herobrine/led.c
index fb68e85deb..475604dd42 100644
--- a/board/herobrine/led.c
+++ b/board/herobrine/led.c
@@ -93,7 +93,7 @@ static void board_led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/homestar/led.c b/board/homestar/led.c
index f6b3cddf48..438b2cae33 100644
--- a/board/homestar/led.c
+++ b/board/homestar/led.c
@@ -81,7 +81,7 @@ static void board_led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 	case PWR_STATE_CHARGE_NEAR_FULL:
 		if (chipset_in_state(CHIPSET_STATE_ON |
diff --git a/board/jinlon/led.c b/board/jinlon/led.c
index a77ee8ba62..43a936e0a2 100644
--- a/board/jinlon/led.c
+++ b/board/jinlon/led.c
@@ -148,7 +148,7 @@ static void led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/kakadu/led.c b/board/kakadu/led.c
index 87070bd7af..ba833e0e22 100644
--- a/board/kakadu/led.c
+++ b/board/kakadu/led.c
@@ -32,7 +32,7 @@ static void kakadu_led_set_battery(void)
 	static uint8_t time_cnt;
 	uint8_t br[EC_LED_COLOR_COUNT] = { 0 };
 
-	chstate = charge_get_state();
+	chstate = led_pwr_get_state();
 	powerstate = power_get_state();
 
 	switch (chstate) {
diff --git a/board/kappa/led.c b/board/kappa/led.c
index d9ecb33da0..6fb3b830f8 100644
--- a/board/kappa/led.c
+++ b/board/kappa/led.c
@@ -87,7 +87,7 @@ static void led_set_battery(void)
 
 	/* override battery led for system suspend */
 	if (chipset_in_state(CHIPSET_STATE_SUSPEND | CHIPSET_STATE_STANDBY) &&
-	    charge_get_state() != PWR_STATE_CHARGE) {
+	    led_pwr_get_state() != PWR_STATE_CHARGE) {
 		led_set_color_battery(power_ticks++ & 0x2 ? LED_WHITE :
 							    LED_OFF);
 		return;
@@ -95,7 +95,7 @@ static void led_set_battery(void)
 
 	power_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		led_set_color_battery(LED_AMBER);
 		break;
diff --git a/board/katsu/led.c b/board/katsu/led.c
index b925f72574..346c5caa19 100644
--- a/board/katsu/led.c
+++ b/board/katsu/led.c
@@ -32,7 +32,7 @@ static void katsu_led_set_battery(void)
 	static uint8_t time_cnt;
 	uint8_t br[EC_LED_COLOR_COUNT] = { 0 };
 
-	chstate = charge_get_state();
+	chstate = led_pwr_get_state();
 	powerstate = power_get_state();
 
 	switch (chstate) {
diff --git a/board/kingoftown/led.c b/board/kingoftown/led.c
index 2bbb0de0af..add916cdea 100644
--- a/board/kingoftown/led.c
+++ b/board/kingoftown/led.c
@@ -106,7 +106,7 @@ static void board_led_set_battery(void)
 	 * charging.
 	 */
 	if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND) &&
-	    charge_get_state() != PWR_STATE_CHARGE) {
+	    led_pwr_get_state() != PWR_STATE_CHARGE) {
 		power_ticks++;
 		led_blink_cycle = power_ticks % (2 * TIMES_TICK_ONE_SEC);
 
@@ -121,7 +121,7 @@ static void board_led_set_battery(void)
 
 	power_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/kukui/led.c b/board/kukui/led.c
index f5ddae5c77..7529f831f9 100644
--- a/board/kukui/led.c
+++ b/board/kukui/led.c
@@ -33,7 +33,7 @@ static void kukui_led_set_battery(void)
 	static uint8_t prv_r, prv_g, prv_b;
 	uint8_t br[EC_LED_COLOR_COUNT] = { 0 };
 
-	chstate = charge_get_state();
+	chstate = led_pwr_get_state();
 
 	if (prv_chstate == chstate && chstate != PWR_STATE_DISCHARGE)
 		return;
diff --git a/board/lantis/led.c b/board/lantis/led.c
index 3b66ad6d6b..75242a60ba 100644
--- a/board/lantis/led.c
+++ b/board/lantis/led.c
@@ -175,7 +175,7 @@ static void led_set_battery(void)
 	 */
 	if (get_cbi_fw_config_tablet_mode() == TABLET_MODE_ABSENT) {
 		if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND) &&
-		    charge_get_state() != PWR_STATE_CHARGE) {
+		    led_pwr_get_state() != PWR_STATE_CHARGE) {
 			power_ticks++;
 
 			led_set_color_battery(RIGHT_PORT, power_ticks & 0x2 ?
@@ -190,7 +190,7 @@ static void led_set_battery(void)
 
 	power_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		set_active_port_color(LED_AMBER);
 		break;
diff --git a/board/lazor/led.c b/board/lazor/led.c
index cf1f68d77e..c550a96896 100644
--- a/board/lazor/led.c
+++ b/board/lazor/led.c
@@ -69,7 +69,7 @@ static void board_led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate amber on when charging. */
 		color = LED_AMBER;
diff --git a/board/madoo/led.c b/board/madoo/led.c
index 5d17acee6e..214a941da8 100644
--- a/board/madoo/led.c
+++ b/board/madoo/led.c
@@ -79,7 +79,7 @@ int battery_safety_check(void)
 	int rv;
 
 	/* ignore battery in error state because it has other behavior */
-	if (charge_get_state() == PWR_STATE_ERROR)
+	if (led_pwr_get_state() == PWR_STATE_ERROR)
 		return false;
 
 	/* turn off LED due to a safety fault */
@@ -130,7 +130,7 @@ __override void led_set_color_battery(enum ec_led_colors color)
 		if (battery_safety_check()) {
 			gpio_set_level(GPIO_BAT_LED_AMBER_L, LED_OFF_LVL);
 			gpio_set_level(GPIO_EC_CHG_LED_R_Y, LED_OFF_LVL);
-		} else if (charge_get_state() == PWR_STATE_ERROR &&
+		} else if (led_pwr_get_state() == PWR_STATE_ERROR &&
 			   system_get_board_version() >= 3) {
 			gpio_set_level(GPIO_EC_CHG_LED_R_W, LED_OFF_LVL);
 			gpio_set_level(GPIO_EC_CHG_LED_R_Y, LED_ON_LVL);
diff --git a/board/marzipan/led.c b/board/marzipan/led.c
index 0a6d8df959..cb55fdddae 100644
--- a/board/marzipan/led.c
+++ b/board/marzipan/led.c
@@ -69,7 +69,7 @@ static void board_led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate amber on when charging. */
 		color = LED_AMBER;
diff --git a/board/mchpevb1/led.c b/board/mchpevb1/led.c
index 8a5d85e97d..98a72c7c85 100644
--- a/board/mchpevb1/led.c
+++ b/board/mchpevb1/led.c
@@ -119,7 +119,7 @@ static void board_led_set_battery(void)
 	 * Same as the chromeos spec
 	 * Green/Amber for CHARGE_FLAG_FORCE_IDLE
 	 */
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		board_led_set_color_battery(LED_AMBER);
 		break;
diff --git a/board/morphius/led.c b/board/morphius/led.c
index 23f715da02..89c2f01793 100644
--- a/board/morphius/led.c
+++ b/board/morphius/led.c
@@ -162,7 +162,7 @@ static void led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		led_set_color_battery(LED_AMBER);
diff --git a/board/mrbland/led.c b/board/mrbland/led.c
index fbc7bf3c19..9cacb4e3f3 100644
--- a/board/mrbland/led.c
+++ b/board/mrbland/led.c
@@ -100,7 +100,7 @@ static void board_led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 	case PWR_STATE_CHARGE_NEAR_FULL:
 		if (chipset_in_state(CHIPSET_STATE_ON |
@@ -159,7 +159,7 @@ static void board_led_set_power(void)
 
 	power_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 	case PWR_STATE_CHARGE_NEAR_FULL:
 	case PWR_STATE_DISCHARGE:
diff --git a/board/nami/led.c b/board/nami/led.c
index 53f6bccd07..dda550cdf6 100644
--- a/board/nami/led.c
+++ b/board/nami/led.c
@@ -509,7 +509,7 @@ static void call_handler(void)
 	if (!led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED))
 		return;
 
-	cs = charge_get_state();
+	cs = led_pwr_get_state();
 	soc = charge_get_display_charge();
 	if (soc < 0)
 		cs = PWR_STATE_ERROR;
diff --git a/board/nautilus/led.c b/board/nautilus/led.c
index f000d79ec8..59d9b70d10 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 led_pwr_state chg_state = charge_get_state();
+	enum led_pwr_state chg_state = led_pwr_get_state();
 	int charge_percent = charge_get_percent();
 
 	if (chipset_in_state(CHIPSET_STATE_ON)) {
diff --git a/board/nipperkin/led.c b/board/nipperkin/led.c
index 5390748af1..99f0c616fe 100644
--- a/board/nipperkin/led.c
+++ b/board/nipperkin/led.c
@@ -140,7 +140,7 @@ static void led_set_battery(void)
 	 * system suspend with non-charging state.
 	 */
 	if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND) &&
-	    charge_get_state() != PWR_STATE_CHARGE) {
+	    led_pwr_get_state() != PWR_STATE_CHARGE) {
 		power_ticks++;
 
 		led_set_color_battery(LED_RIGHT_PORT,
@@ -158,7 +158,7 @@ static void led_set_battery(void)
 
 	power_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/oak/led.c b/board/oak/led.c
index cbf951dec5..b8ae3be780 100644
--- a/board/oak/led.c
+++ b/board/oak/led.c
@@ -154,7 +154,7 @@ static void oak_led_set_battery(int board_version)
 		 * - Battery discharging capacity<10%, red blink
 		 * - Battery error: Red ON
 		 */
-		switch (charge_get_state()) {
+		switch (led_pwr_get_state()) {
 		case PWR_STATE_CHARGE:
 			bat_led_set(BAT_LED_AMBER, 1);
 			break;
@@ -219,7 +219,7 @@ static void oak_led_set_battery(int board_version)
 		 *   situation: Orange in blinking mode (1s on, 1s off)
 		 * Using battery or not connected to AC power: OFF
 		 */
-		switch (charge_get_state()) {
+		switch (led_pwr_get_state()) {
 		case PWR_STATE_CHARGE:
 			bat_led_set(BAT_LED_ORANGE, 1);
 			break;
diff --git a/board/pazquel/led.c b/board/pazquel/led.c
index 180e9829f5..0b67b83878 100644
--- a/board/pazquel/led.c
+++ b/board/pazquel/led.c
@@ -68,7 +68,7 @@ static void board_led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate amber on when charging. */
 		color = LED_RED;
diff --git a/board/pompom/led.c b/board/pompom/led.c
index 31fccbf4e2..2668f05e0f 100644
--- a/board/pompom/led.c
+++ b/board/pompom/led.c
@@ -85,7 +85,7 @@ static void board_led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate amber on when charging. */
 		color = LED_AMBER;
diff --git a/board/poppy/led.c b/board/poppy/led.c
index f388dd0326..7f94a84147 100644
--- a/board/poppy/led.c
+++ b/board/poppy/led.c
@@ -96,7 +96,7 @@ static void board_led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/primus/led.c b/board/primus/led.c
index 269b497c4b..b25eade32c 100644
--- a/board/primus/led.c
+++ b/board/primus/led.c
@@ -69,7 +69,7 @@ static void led_set_color_battery(enum ec_led_colors color)
 
 static void led_set_battery(void)
 {
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		led_set_color_battery(EC_LED_COLOR_AMBER);
diff --git a/board/quackingstick/led.c b/board/quackingstick/led.c
index ef3a858e2b..202a7e7847 100644
--- a/board/quackingstick/led.c
+++ b/board/quackingstick/led.c
@@ -72,7 +72,7 @@ static void board_led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate amber on when charging. */
 		color = LED_AMBER;
diff --git a/board/rammus/led.c b/board/rammus/led.c
index 2a4877b6b1..6526ab0cea 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 led_pwr_state chg_state = charge_get_state();
+	enum led_pwr_state chg_state = led_pwr_get_state();
 	int charge_percent = charge_get_percent();
 	static unsigned int charge_ticks;
 
diff --git a/board/redrix/led.c b/board/redrix/led.c
index 0eae346948..194ba6cb7d 100644
--- a/board/redrix/led.c
+++ b/board/redrix/led.c
@@ -158,7 +158,7 @@ static void led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/reef/led.c b/board/reef/led.c
index 8bc52dbc75..adc9ab823f 100644
--- a/board/reef/led.c
+++ b/board/reef/led.c
@@ -95,7 +95,7 @@ static void led_set_battery(void)
 	static int battery_ticks;
 	static int suspend_ticks;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		led_set_color_battery(LED_AMBER);
 		break;
diff --git a/board/reef_it8320/led.c b/board/reef_it8320/led.c
index 630fdf336d..c150b237c4 100644
--- a/board/reef_it8320/led.c
+++ b/board/reef_it8320/led.c
@@ -96,7 +96,7 @@ static void led_set_battery(void)
 	static int battery_ticks;
 	static int suspend_ticks;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		led_set_color_battery(LED_AMBER);
 		break;
diff --git a/board/reef_mchp/led.c b/board/reef_mchp/led.c
index 96ea6bb958..37ec8493e7 100644
--- a/board/reef_mchp/led.c
+++ b/board/reef_mchp/led.c
@@ -96,7 +96,7 @@ static void led_set_battery(void)
 	static int battery_ticks;
 	static int suspend_ticks;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		led_set_color_battery(LED_AMBER);
 		break;
diff --git a/board/scarlet/led.c b/board/scarlet/led.c
index 6f42f462cf..c550d3bad9 100644
--- a/board/scarlet/led.c
+++ b/board/scarlet/led.c
@@ -63,7 +63,7 @@ static void scarlet_led_set_battery(void)
 
 	battery_second++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		bat_led_set_color(LED_AMBER);
 		break;
diff --git a/board/trogdor/led.c b/board/trogdor/led.c
index 3a7d8df108..4b9a8aa005 100644
--- a/board/trogdor/led.c
+++ b/board/trogdor/led.c
@@ -93,7 +93,7 @@ static void board_led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/vell/led.c b/board/vell/led.c
index 2f44788bd5..22e8187364 100644
--- a/board/vell/led.c
+++ b/board/vell/led.c
@@ -155,7 +155,7 @@ static void led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/board/wormdingler/led.c b/board/wormdingler/led.c
index f6b3cddf48..438b2cae33 100644
--- a/board/wormdingler/led.c
+++ b/board/wormdingler/led.c
@@ -81,7 +81,7 @@ static void board_led_set_battery(void)
 
 	battery_ticks++;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 	case PWR_STATE_CHARGE_NEAR_FULL:
 		if (chipset_in_state(CHIPSET_STATE_ON |
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c
index 72caa44d40..1942c1a135 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 led_pwr_state charge_get_state(void)
+enum led_pwr_state led_pwr_get_state(void)
 {
 	uint32_t chflags;
 
diff --git a/common/led_onoff_states.c b/common/led_onoff_states.c
index 404ae06cd9..a08d1fe1bb 100644
--- a/common/led_onoff_states.c
+++ b/common/led_onoff_states.c
@@ -49,7 +49,7 @@ static enum led_states led_get_state(void)
 	if (!IS_ENABLED(CONFIG_CHARGER))
 		return new_state;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Get percent charge */
 		charge_lvl = led_get_charge_percent();
diff --git a/common/led_policy_std.c b/common/led_policy_std.c
index b9d95af639..6e89290c57 100644
--- a/common/led_policy_std.c
+++ b/common/led_policy_std.c
@@ -159,7 +159,7 @@ static void std_led_set_battery(void)
 	 * Same as the chromeos spec
 	 * Green/Amber for CHARGE_FLAG_FORCE_IDLE
 	 */
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		bat_led_set_color(LED_AMBER);
 		break;
diff --git a/common/led_pwm.c b/common/led_pwm.c
index b4d590bdf2..1573eb03a9 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 led_pwr_state chg_st = charge_get_state();
+	enum led_pwr_state chg_st = led_pwr_get_state();
 
 	/*
 	 * The colors listed below are the default, but can be overridden.
diff --git a/common/lightbar.c b/common/lightbar.c
index f3343c6a0c..3a96a2d5f5 100644
--- a/common/lightbar.c
+++ b/common/lightbar.c
@@ -265,7 +265,7 @@ static int get_battery_level(void)
 
 #ifdef HAS_TASK_CHARGER
 	st.battery_percent = pct = charge_get_percent();
-	st.battery_is_charging = (PWR_STATE_DISCHARGE != charge_get_state());
+	st.battery_is_charging = (PWR_STATE_DISCHARGE != led_pwr_get_state());
 	st.battery_is_power_on_prevented = charge_prevent_power_on(0);
 #endif
 
diff --git a/driver/charger/isl9241.c b/driver/charger/isl9241.c
index 2bb3d75f28..3529f9d2a5 100644
--- a/driver/charger/isl9241.c
+++ b/driver/charger/isl9241.c
@@ -1215,7 +1215,7 @@ static int isl9241_ramp_get_current_limit(int chgnum)
 static void isl9241_restart_charge_voltage_when_full(void)
 {
 	if (!chipset_in_or_transitioning_to_state(CHIPSET_STATE_ON) &&
-	    charge_get_state() == PWR_STATE_CHARGE_NEAR_FULL &&
+	    led_pwr_get_state() == PWR_STATE_CHARGE_NEAR_FULL &&
 	    battery_get_disconnect_state() == BATTERY_NOT_DISCONNECTED) {
 		charger_discharge_on_ac(1);
 		msleep(50);
diff --git a/driver/led/ds2413.c b/driver/led/ds2413.c
index 5268e52ac0..1b91f2b2b1 100644
--- a/driver/led/ds2413.c
+++ b/driver/led/ds2413.c
@@ -107,7 +107,7 @@ static void onewire_led_tick(void)
 	}
 
 	/* Translate charge state to LED color */
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_IDLE:
 		new_color = LED_GREEN;
 		break;
diff --git a/include/charge_state.h b/include/charge_state.h
index 6d9c1d5b19..57f9521b0e 100644
--- a/include/charge_state.h
+++ b/include/charge_state.h
@@ -75,7 +75,7 @@ enum led_pwr_state {
 /**
  * Return current charge state.
  */
-enum led_pwr_state charge_get_state(void);
+enum led_pwr_state led_pwr_get_state(void);
 
 /**
  * Return current charge v2 state.
diff --git a/include/charge_state_v2.h b/include/charge_state_v2.h
index 6d0b936f4a..cb46d92e1b 100644
--- a/include/charge_state_v2.h
+++ b/include/charge_state_v2.h
@@ -17,7 +17,7 @@
 #define __CROS_EC_CHARGE_STATE_V2_H
 
 /*
- * The values exported by charge_get_state() and charge_get_flags() are used
+ * The values exported by led_pwr_get_state() and charge_get_flags() are used
  * only to control the LEDs (with one not-quite-correct exception). For V2
  * we use a different set of states internally.
  */
diff --git a/test/sbs_charging_v2.c b/test/sbs_charging_v2.c
index 0b12aea739..482770ff1c 100644
--- a/test/sbs_charging_v2.c
+++ b/test/sbs_charging_v2.c
@@ -127,7 +127,7 @@ test_static int wait_charging_state(void)
 	enum led_pwr_state state;
 	task_wake(TASK_ID_CHARGER);
 	msleep(WAIT_CHARGER_TASK);
-	state = charge_get_state();
+	state = led_pwr_get_state();
 	ccprintf("[CHARGING TEST] state = %d\n", state);
 	return state;
 }
@@ -504,7 +504,7 @@ test_static int test_external_funcs(void)
 	TEST_ASSERT(!(flags & CHARGE_FLAG_FORCE_IDLE));
 
 	/* and the rest */
-	TEST_ASSERT(charge_get_state() == PWR_STATE_CHARGE);
+	TEST_ASSERT(led_pwr_get_state() == PWR_STATE_CHARGE);
 	TEST_ASSERT(!charge_want_shutdown());
 	TEST_ASSERT(charge_get_percent() == 50);
 	temp = 0;
diff --git a/zephyr/program/corsola/tentacruel/src/temp.c b/zephyr/program/corsola/tentacruel/src/temp.c
index 2e584640be..72fcc526bd 100644
--- a/zephyr/program/corsola/tentacruel/src/temp.c
+++ b/zephyr/program/corsola/tentacruel/src/temp.c
@@ -62,7 +62,7 @@ static void current_update(void)
 
 	temp = average_tempature();
 #ifndef CONFIG_TEST
-	if (charge_get_state() == PWR_STATE_DISCHARGE) {
+	if (led_pwr_get_state() == PWR_STATE_DISCHARGE) {
 		current_level = 0;
 		uptime = 0;
 		dntime = 0;
diff --git a/zephyr/program/intelrvp/src/intel_rvp_led.c b/zephyr/program/intelrvp/src/intel_rvp_led.c
index 22de04601b..91af0dfb55 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 led_pwr_state chg_st = charge_get_state();
+	enum led_pwr_state chg_st = led_pwr_get_state();
 
 	/*
 	 * The colors listed below are the default, but can be overridden.
diff --git a/zephyr/program/nissa/yaviks/src/led.c b/zephyr/program/nissa/yaviks/src/led.c
index 7671bd3a92..db93ae4b47 100644
--- a/zephyr/program/nissa/yaviks/src/led.c
+++ b/zephyr/program/nissa/yaviks/src/led.c
@@ -140,7 +140,7 @@ static void led_set_battery(void)
 	 * system suspend with non-charging state.
 	 */
 	if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND) &&
-	    charge_get_state() != PWR_STATE_CHARGE) {
+	    led_pwr_get_state() != PWR_STATE_CHARGE) {
 		suspend_ticks++;
 
 		led_set_color_battery(RIGHT_PORT,
@@ -158,7 +158,7 @@ static void led_set_battery(void)
 
 	suspend_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/zephyr/program/nissa/yavilla/src/led.c b/zephyr/program/nissa/yavilla/src/led.c
index 5bbc9d15b1..d123af8142 100644
--- a/zephyr/program/nissa/yavilla/src/led.c
+++ b/zephyr/program/nissa/yavilla/src/led.c
@@ -176,7 +176,7 @@ static void led_set_battery(void)
 	 * system suspend with non-charging state.
 	 */
 	if (!power_led_support && chipset_in_state(CHIPSET_STATE_ANY_SUSPEND) &&
-	    charge_get_state() != PWR_STATE_CHARGE) {
+	    led_pwr_get_state() != PWR_STATE_CHARGE) {
 		suspend_ticks++;
 
 		led_set_color_battery(RIGHT_PORT,
@@ -194,7 +194,7 @@ static void led_set_battery(void)
 
 	suspend_ticks = 0;
 
-	switch (charge_get_state()) {
+	switch (led_pwr_get_state()) {
 	case PWR_STATE_CHARGE:
 		/* Always indicate when charging, even in suspend. */
 		set_active_port_color(LED_AMBER);
diff --git a/zephyr/shim/src/led_driver/led.c b/zephyr/shim/src/led_driver/led.c
index 6833ef4372..84eab2c6fe 100644
--- a/zephyr/shim/src/led_driver/led.c
+++ b/zephyr/shim/src/led_driver/led.c
@@ -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 led_pwr_state pwr_state = charge_get_state();
+		enum led_pwr_state pwr_state = led_pwr_get_state();
 
 		if (node_array[node_idx].pwr_state != pwr_state)
 			return -1;