hooks: rename charger init priority to match others

Rename HOOK_PRIO_CHARGE_MANAGER_INIT to HOOK_PRIO_INIT_CHARGE_MANAGER,
matching the pattern used for the other initialization priorities.

BUG=none
BRANCH=none
TEST=compare_build.sh

Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: Icb80b3cb1297888fcde2eb7d6de86fbc215fe212
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3553673
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>

11 files changed, 12 insertions, 12 deletions

diff --git a/baseboard/kukui/base_detect_kukui.c b/baseboard/kukui/base_detect_kukui.c
index 68542b4fb6..55da56f687 100644
--- a/baseboard/kukui/base_detect_kukui.c
+++ b/baseboard/kukui/base_detect_kukui.c
@@ -227,5 +227,5 @@ static void board_pogo_charge_init(void)
 		charge_manager_update_charge(i, CHARGE_PORT_POGO, NULL);
 }
 DECLARE_HOOK(HOOK_INIT, board_pogo_charge_init,
-	     HOOK_PRIO_CHARGE_MANAGER_INIT + 1);
+	     HOOK_PRIO_INIT_CHARGE_MANAGER + 1);
 #endif
diff --git a/board/ambassador/board.c b/board/ambassador/board.c
index a5abbaa130..5cf319bc79 100644
--- a/board/ambassador/board.c
+++ b/board/ambassador/board.c
@@ -237,7 +237,7 @@ static void adp_state_init(void)
 	/* Report charge state from the barrel jack. */
 	adp_connect_deferred();
 }
-DECLARE_HOOK(HOOK_INIT, adp_state_init, HOOK_PRIO_CHARGE_MANAGER_INIT + 1);
+DECLARE_HOOK(HOOK_INIT, adp_state_init, HOOK_PRIO_INIT_CHARGE_MANAGER + 1);
 
 
 #include "gpio_list.h" /* Must come after other header files. */
diff --git a/board/brask/board.c b/board/brask/board.c
index 4353e8b0e9..022ce8f43c 100644
--- a/board/brask/board.c
+++ b/board/brask/board.c
@@ -243,7 +243,7 @@ static void adp_state_init(void)
 	/* Report charge state from the barrel jack. */
 	adp_connect_deferred();
 }
-DECLARE_HOOK(HOOK_INIT, adp_state_init, HOOK_PRIO_CHARGE_MANAGER_INIT + 1);
+DECLARE_HOOK(HOOK_INIT, adp_state_init, HOOK_PRIO_INIT_CHARGE_MANAGER + 1);
 
 static void board_init(void)
 {
diff --git a/board/dooly/board.c b/board/dooly/board.c
index 06e479649d..45ebca1232 100644
--- a/board/dooly/board.c
+++ b/board/dooly/board.c
@@ -468,7 +468,7 @@ static void adp_state_init(void)
 	/* Report charge state from the barrel jack. */
 	adp_connect_deferred();
 }
-DECLARE_HOOK(HOOK_INIT, adp_state_init, HOOK_PRIO_CHARGE_MANAGER_INIT + 1);
+DECLARE_HOOK(HOOK_INIT, adp_state_init, HOOK_PRIO_INIT_CHARGE_MANAGER + 1);
 
 
 #include "gpio_list.h" /* Must come after other header files. */
diff --git a/board/fizz/board.c b/board/fizz/board.c
index 975401d5a1..a397ca27e4 100644
--- a/board/fizz/board.c
+++ b/board/fizz/board.c
@@ -537,7 +537,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
 
 	/*
 	 * In terms of timing, this should always work because
-	 * HOOK_PRIO_CHARGE_MANAGER_INIT is notified after HOOK_PRIO_INIT_I2C.
+	 * HOOK_PRIO_INIT_CHARGE_MANAGER is notified after HOOK_PRIO_INIT_I2C.
 	 * If CBI isn't initialized or contains invalid data, we assume it's
 	 * a new board.
 	 */
@@ -811,7 +811,7 @@ static void board_charge_manager_init(void)
 	}
 }
 DECLARE_HOOK(HOOK_INIT, board_charge_manager_init,
-	     HOOK_PRIO_CHARGE_MANAGER_INIT + 1);
+	     HOOK_PRIO_INIT_CHARGE_MANAGER + 1);
 
 static void board_init(void)
 {
diff --git a/board/kinox/board.c b/board/kinox/board.c
index 0dc4ae5737..43a1cef501 100644
--- a/board/kinox/board.c
+++ b/board/kinox/board.c
@@ -155,7 +155,7 @@ static void adp_state_init(void)
 	/* Report charge state from the barrel jack. */
 	adp_connect_deferred();
 }
-DECLARE_HOOK(HOOK_INIT, adp_state_init, HOOK_PRIO_CHARGE_MANAGER_INIT + 1);
+DECLARE_HOOK(HOOK_INIT, adp_state_init, HOOK_PRIO_INIT_CHARGE_MANAGER + 1);
 
 static void board_init(void)
 {
diff --git a/board/moli/board.c b/board/moli/board.c
index 9ca199d207..10b4de5589 100644
--- a/board/moli/board.c
+++ b/board/moli/board.c
@@ -186,7 +186,7 @@ static void adp_state_init(void)
 	/* Report charge state from the barrel jack. */
 	adp_connect_deferred();
 }
-DECLARE_HOOK(HOOK_INIT, adp_state_init, HOOK_PRIO_CHARGE_MANAGER_INIT + 1);
+DECLARE_HOOK(HOOK_INIT, adp_state_init, HOOK_PRIO_INIT_CHARGE_MANAGER + 1);
 
 static void board_init(void)
 {
diff --git a/board/puff/board.c b/board/puff/board.c
index bf22657bf4..a893de33c3 100644
--- a/board/puff/board.c
+++ b/board/puff/board.c
@@ -237,7 +237,7 @@ static void adp_state_init(void)
 	/* Report charge state from the barrel jack. */
 	adp_connect_deferred();
 }
-DECLARE_HOOK(HOOK_INIT, adp_state_init, HOOK_PRIO_CHARGE_MANAGER_INIT + 1);
+DECLARE_HOOK(HOOK_INIT, adp_state_init, HOOK_PRIO_INIT_CHARGE_MANAGER + 1);
 
 
 #include "gpio_list.h" /* Must come after other header files. */
diff --git a/common/charge_manager.c b/common/charge_manager.c
index 0e7c0da702..11b7bcac0e 100644
--- a/common/charge_manager.c
+++ b/common/charge_manager.c
@@ -234,7 +234,7 @@ static void charge_manager_init(void)
 			source_port_rp[i] = CONFIG_USB_PD_PULLUP;
 	}
 }
-DECLARE_HOOK(HOOK_INIT, charge_manager_init, HOOK_PRIO_CHARGE_MANAGER_INIT);
+DECLARE_HOOK(HOOK_INIT, charge_manager_init, HOOK_PRIO_INIT_CHARGE_MANAGER);
 
 /**
  * Check if the charge manager is seeded.
diff --git a/common/usb_charger.c b/common/usb_charger.c
index bba88f4f11..b49f07b483 100644
--- a/common/usb_charger.c
+++ b/common/usb_charger.c
@@ -125,7 +125,7 @@ static void usb_charger_init(void)
 		update_vbus_supplier(i, pd_is_vbus_present(i));
 	}
 }
-DECLARE_HOOK(HOOK_INIT, usb_charger_init, HOOK_PRIO_CHARGE_MANAGER_INIT + 1);
+DECLARE_HOOK(HOOK_INIT, usb_charger_init, HOOK_PRIO_INIT_CHARGE_MANAGER + 1);
 
 void usb_charger_task(void *u)
 {
diff --git a/include/hooks.h b/include/hooks.h
index 8f64e6d241..facb78df9d 100644
--- a/include/hooks.h
+++ b/include/hooks.h
@@ -51,7 +51,7 @@ enum hook_priority {
 	/* Init VBOOT hash later, since it depends on deferred functions */
 	HOOK_PRIO_INIT_VBOOT_HASH = HOOK_PRIO_FIRST + 11,
 	/* Init charge manager before usage in board init */
-	HOOK_PRIO_CHARGE_MANAGER_INIT = HOOK_PRIO_FIRST + 12,
+	HOOK_PRIO_INIT_CHARGE_MANAGER = HOOK_PRIO_FIRST + 12,
 
 	HOOK_PRIO_INIT_ADC = HOOK_PRIO_DEFAULT,
 	HOOK_PRIO_INIT_DAC = HOOK_PRIO_DEFAULT,