8 files changed, 16 insertions, 26 deletions
diff --git a/zephyr/subsys/ap_pwrseq/include/signal_adc.h b/zephyr/subsys/ap_pwrseq/include/signal_adc.h
index dea6d315d8..81c6a1edd4 100644
--- a/zephyr/subsys/ap_pwrseq/include/signal_adc.h
+++ b/zephyr/subsys/ap_pwrseq/include/signal_adc.h
@@ -6,8 +6,6 @@
 #ifndef __AP_PWRSEQ_SIGNAL_ADC_H__
 #define __AP_PWRSEQ_SIGNAL_ADC_H__
 
-#include <power_signals.h>
-
 #define PWR_SIG_TAG_ADC PWR_ADC_
 
 /*
diff --git a/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h b/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h
index 75390b5005..dcb2b3b968 100644
--- a/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h
+++ b/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h
@@ -7,7 +7,6 @@
 #define __X86_COMMON_PWRSEQ_H__
 
 #include <zephyr/logging/log.h>
-
 #include <ap_power/ap_power_interface.h>
 #include <ap_power_override_functions.h>
 #include <power_signals.h>
diff --git a/zephyr/subsys/ap_pwrseq/power_host_sleep.c b/zephyr/subsys/ap_pwrseq/power_host_sleep.c
index bc38215921..30025d21ea 100644
--- a/zephyr/subsys/ap_pwrseq/power_host_sleep.c
+++ b/zephyr/subsys/ap_pwrseq/power_host_sleep.c
@@ -174,11 +174,10 @@ void ap_power_sleep_notify_transition(enum ap_power_sleep_type check_state)
 		ap_power_ev_send_callbacks(AP_POWER_SUSPEND);
 	} else if (check_state == AP_POWER_SLEEP_RESUME) {
 		ap_power_ev_send_callbacks(AP_POWER_RESUME);
-		/*
-		 * Transition is done; reset sleep state after resume.
-		 */
-		ap_power_sleep_set_notify(AP_POWER_SLEEP_NONE);
 	}
+
+	/* Transition is done; reset sleep state. */
+	ap_power_sleep_set_notify(AP_POWER_SLEEP_NONE);
 }
 #endif /* CONFIG_AP_PWRSEQ_S0IX */
 
diff --git a/zephyr/subsys/ap_pwrseq/power_signals.c b/zephyr/subsys/ap_pwrseq/power_signals.c
index 1ae8604a3a..a02eef6e6b 100644
--- a/zephyr/subsys/ap_pwrseq/power_signals.c
+++ b/zephyr/subsys/ap_pwrseq/power_signals.c
@@ -3,18 +3,18 @@
  * found in the LICENSE file.
  */
 
-#include "signal_adc.h"
-#include "signal_gpio.h"
-#include "signal_vw.h"
-
 #include <zephyr/kernel.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/atomic.h>
-#include <zephyr/toolchain.h>
 
 #include <ap_power/ap_pwrseq.h>
 #include <power_signals.h>
 
+#include "signal_gpio.h"
+#include "signal_vw.h"
+#include "signal_adc.h"
+
 LOG_MODULE_DECLARE(ap_pwrseq, CONFIG_AP_PWRSEQ_LOG_LEVEL);
 
 #if DT_HAS_COMPAT_STATUS_OKAY(intel_ap_pwrseq)
diff --git a/zephyr/subsys/ap_pwrseq/signal_gpio.c b/zephyr/subsys/ap_pwrseq/signal_gpio.c
index f09f6b23cb..1dbd430bef 100644
--- a/zephyr/subsys/ap_pwrseq/signal_gpio.c
+++ b/zephyr/subsys/ap_pwrseq/signal_gpio.c
@@ -3,12 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include "system.h"
-
-#include <zephyr/drivers/gpio.h>
-
 #include <power_signals.h>
 #include <signal_gpio.h>
+#include <zephyr/drivers/gpio.h>
+#include "system.h"
 
 #define MY_COMPAT intel_ap_pwrseq_gpio
 
diff --git a/zephyr/subsys/ap_pwrseq/signal_vw.c b/zephyr/subsys/ap_pwrseq/signal_vw.c
index cee88e362d..0e9e4affff 100644
--- a/zephyr/subsys/ap_pwrseq/signal_vw.c
+++ b/zephyr/subsys/ap_pwrseq/signal_vw.c
@@ -3,13 +3,12 @@
  * found in the LICENSE file.
  */
 
-#include "signal_vw.h"
-
-#include <zephyr/drivers/espi.h>
-
 #include <atomic.h>
+#include <zephyr/drivers/espi.h>
 #include <x86_non_dsx_common_pwrseq_sm_handler.h>
 
+#include "signal_vw.h"
+
 #define MY_COMPAT intel_ap_pwrseq_vw
 
 #if HAS_VW_SIGNALS
diff --git a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c
index 6ac2b5e0ba..dbceeacc85 100644
--- a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c
+++ b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c
@@ -3,10 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <stdlib.h>
-
 #include <zephyr/shell/shell.h>
-
+#include <stdlib.h>
 #include <x86_non_dsx_common_pwrseq_sm_handler.h>
 
 LOG_MODULE_DECLARE(ap_pwrseq, CONFIG_AP_PWRSEQ_LOG_LEVEL);
diff --git a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c
index 55f1414a4b..09846759ee 100644
--- a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c
+++ b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c
@@ -3,12 +3,11 @@
  * found in the LICENSE file.
  */
 
-#include "zephyr_console_shim.h"
-
+#include <atomic.h>
 #include <zephyr/init.h>
 
-#include <atomic.h>
 #include <x86_non_dsx_common_pwrseq_sm_handler.h>
+#include "zephyr_console_shim.h"
 
 static K_KERNEL_STACK_DEFINE(pwrseq_thread_stack, CONFIG_AP_PWRSEQ_STACK_SIZE);
 static struct k_thread pwrseq_thread_data;