diff --git a/kernel/idle.c b/kernel/idle.c
index 0c52d4da5d3..423e0eaa80c 100644
--- a/kernel/idle.c
+++ b/kernel/idle.c
@@ -17,37 +17,6 @@
 
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
-/**
- * @brief Indicate that kernel is idling in tickless mode
- *
- * Sets the kernel data structure idle field to either a positive value or
- * K_FOREVER.
- */
-static void pm_save_idle(void)
-{
-#ifdef CONFIG_PM
-	int32_t ticks = z_get_next_timeout_expiry();
-	_kernel.idle = ticks;
-
-	/*
-	 * Call the suspend hook function of the soc interface to allow
-	 * entry into a low power state. The function returns
-	 * false if low power state was not entered, in which
-	 * case, kernel does normal idle processing.
-	 *
-	 * This function is entered with interrupts disabled. If a low power
-	 * state was entered, then the hook function should enable inerrupts
-	 * before exiting. This is because the kernel does not do its own idle
-	 * processing in those cases i.e. skips k_cpu_idle(). The kernel's
-	 * idle processing re-enables interrupts which is essential for
-	 * the kernel's scheduling logic.
-	 */
-	if (pm_system_suspend(ticks) == false) {
-		k_cpu_idle();
-	}
-#endif
-}
-
 void z_pm_save_idle_exit(void)
 {
 #ifdef CONFIG_PM
@@ -92,11 +61,30 @@ void idle(void *unused1, void *unused2, void *unused3)
 		 */
 		(void) arch_irq_lock();
 
-		if (IS_ENABLED(CONFIG_PM)) {
-			pm_save_idle();
-		} else {
+#ifdef CONFIG_PM
+		_kernel.idle = z_get_next_timeout_expiry();
+
+		/*
+		 * Call the suspend hook function of the soc interface
+		 * to allow entry into a low power state. The function
+		 * returns false if low power state was not entered, in
+		 * which case, kernel does normal idle processing.
+		 *
+		 * This function is entered with interrupts disabled.
+		 * If a low power state was entered, then the hook
+		 * function should enable inerrupts before exiting.
+		 * This is because the kernel does not do its own idle
+		 * processing in those cases i.e. skips k_cpu_idle().
+		 * The kernel's idle processing re-enables interrupts
+		 * which is essential for the kernel's scheduling
+		 * logic.
+		 */
+		if (pm_system_suspend(_kernel.idle) == false) {
 			k_cpu_idle();
 		}
+#else
+		k_cpu_idle();
+#endif
 
 #if !defined(CONFIG_PREEMPT_ENABLED)
 # if !defined(CONFIG_USE_SWITCH) || defined(CONFIG_SPARC)