From 7dd429721415a301d391408ed0578143daef6487 Mon Sep 17 00:00:00 2001 From: Flavio Ceolin Date: Mon, 15 Nov 2021 21:22:38 -0800 Subject: [PATCH] pm: Remove unused parameter The number of ticks on z_pm_save_idle_exit is not used and there is no need to have it. Signed-off-by: Flavio Ceolin --- arch/arc/core/isr_wrapper.S | 2 -- arch/arm/core/aarch32/irq_manage.c | 4 +--- arch/posix/core/swap.c | 4 +--- arch/x86/core/ia32/intstub.S | 4 ---- include/arch/x86/ia32/arch.h | 4 +--- include/pm/pm.h | 2 +- kernel/idle.c | 2 +- 7 files changed, 5 insertions(+), 17 deletions(-) diff --git a/arch/arc/core/isr_wrapper.S b/arch/arc/core/isr_wrapper.S index 079d633c2d9..5914307b36d 100644 --- a/arch/arc/core/isr_wrapper.S +++ b/arch/arc/core/isr_wrapper.S @@ -249,8 +249,6 @@ rirq_path: #if defined(CONFIG_PM) clri r0 /* do not interrupt exiting tickless idle operations */ MOVR r1, _kernel - /* z_kernel.idle is 32 bit despite of platform bittnes */ - ld_s r3, [r1, _kernel_offset_to_idle] /* requested idle duration */ breq r3, 0, _skip_pm_save_idle_exit st 0, [r1, _kernel_offset_to_idle] /* zero idle duration */ diff --git a/arch/arm/core/aarch32/irq_manage.c b/arch/arm/core/aarch32/irq_manage.c index bdbaf48edbb..5bb5e272869 100644 --- a/arch/arm/core/aarch32/irq_manage.c +++ b/arch/arm/core/aarch32/irq_manage.c @@ -181,10 +181,8 @@ void _arch_isr_direct_pm(void) #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */ if (_kernel.idle) { - int32_t idle_val = _kernel.idle; - _kernel.idle = 0; - z_pm_save_idle_exit(idle_val); + z_pm_save_idle_exit(); } #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE) \ diff --git a/arch/posix/core/swap.c b/arch/posix/core/swap.c index ce25f0ea683..fd85f69c647 100644 --- a/arch/posix/core/swap.c +++ b/arch/posix/core/swap.c @@ -111,10 +111,8 @@ void arch_switch_to_main_thread(struct k_thread *main_thread, char *stack_ptr, void posix_irq_check_idle_exit(void) { if (_kernel.idle) { - int32_t idle_val = _kernel.idle; - _kernel.idle = 0; - z_pm_save_idle_exit(idle_val); + z_pm_save_idle_exit(); } } #endif diff --git a/arch/x86/core/ia32/intstub.S b/arch/x86/core/ia32/intstub.S index a442bb043aa..8f7f130d56f 100644 --- a/arch/x86/core/ia32/intstub.S +++ b/arch/x86/core/ia32/intstub.S @@ -301,8 +301,6 @@ nestedInterrupt: handle_idle: pushl %eax pushl %edx - /* Populate 'ticks' argument to z_pm_save_idle_exit */ - push _kernel_offset_to_idle(%ecx) /* Zero out _kernel.idle */ movl $0, _kernel_offset_to_idle(%ecx) @@ -314,8 +312,6 @@ handle_idle: */ call z_pm_save_idle_exit - /* discard 'ticks' argument passed on the stack */ - add $0x4, %esp popl %edx popl %eax jmp alreadyOnIntStack diff --git a/include/arch/x86/ia32/arch.h b/include/arch/x86/ia32/arch.h index 8ac85729d14..0f9ea0e41c7 100644 --- a/include/arch/x86/ia32/arch.h +++ b/include/arch/x86/ia32/arch.h @@ -244,10 +244,8 @@ typedef struct s_isrList { static inline void arch_irq_direct_pm(void) { if (_kernel.idle) { - int32_t idle_val = _kernel.idle; - _kernel.idle = 0; - z_pm_save_idle_exit(idle_val); + z_pm_save_idle_exit(); } } diff --git a/include/pm/pm.h b/include/pm/pm.h index b98bc6126c7..5ace3e626c1 100644 --- a/include/pm/pm.h +++ b/include/pm/pm.h @@ -215,7 +215,7 @@ void pm_power_state_exit_post_ops(struct pm_state_info info); #endif /* CONFIG_PM */ -void z_pm_save_idle_exit(int32_t ticks); +void z_pm_save_idle_exit(void); #ifdef __cplusplus } diff --git a/kernel/idle.c b/kernel/idle.c index 137c4d6351e..0c52d4da5d3 100644 --- a/kernel/idle.c +++ b/kernel/idle.c @@ -48,7 +48,7 @@ static void pm_save_idle(void) #endif } -void z_pm_save_idle_exit(int32_t ticks) +void z_pm_save_idle_exit(void) { #ifdef CONFIG_PM /* Some CPU low power states require notification at the ISR