[08/16] cris idle: delete idle and pm_idle
diff mbox

Message ID 128d290dacc38d1a3d09031018adf017eec0b5f2.1360475150.git.len.brown@intel.com
State New, archived
Delegated to: Len Brown
Headers show

Commit Message

Len Brown Feb. 10, 2013, 5:58 a.m. UTC
From: Len Brown <len.brown@intel.com>

pm_idle() and idle() served no purpose on cris --
invoke default_idle() directly.

Signed-off-by: Len Brown <len.brown@intel.com>
Cc: linux-cris-kernel@axis.com
---
 arch/cris/kernel/process.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

Comments

Jesper Nilsson Feb. 11, 2013, 8:42 a.m. UTC | #1
On Sun, Feb 10, 2013 at 06:58:15AM +0100, Len Brown wrote:
> From: Len Brown <len.brown@intel.com>
> 
> pm_idle() and idle() served no purpose on cris --
> invoke default_idle() directly.
> 
> Signed-off-by: Len Brown <len.brown@intel.com>
> Cc: linux-cris-kernel@axis.com

Looks good!

Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>

> ---
>  arch/cris/kernel/process.c | 11 +----------
>  1 file changed, 1 insertion(+), 10 deletions(-)
> 
> diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c
> index 7f65be6..104ff4d 100644
> --- a/arch/cris/kernel/process.c
> +++ b/arch/cris/kernel/process.c
> @@ -54,11 +54,6 @@ void enable_hlt(void)
>  
>  EXPORT_SYMBOL(enable_hlt);
>   
> -/*
> - * The following aren't currently used.
> - */
> -void (*pm_idle)(void);
> -
>  extern void default_idle(void);
>  
>  void (*pm_power_off)(void);
> @@ -77,16 +72,12 @@ void cpu_idle (void)
>  	while (1) {
>  		rcu_idle_enter();
>  		while (!need_resched()) {
> -			void (*idle)(void);
>  			/*
>  			 * Mark this as an RCU critical section so that
>  			 * synchronize_kernel() in the unload path waits
>  			 * for our completion.
>  			 */
> -			idle = pm_idle;
> -			if (!idle)
> -				idle = default_idle;
> -			idle();
> +			default_idle();
>  		}
>  		rcu_idle_exit();
>  		schedule_preempt_disabled();
> -- 
> 1.8.1.3.535.ga923c31

/^JN - Jesper Nilsson

Patch
diff mbox

diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c
index 7f65be6..104ff4d 100644
--- a/arch/cris/kernel/process.c
+++ b/arch/cris/kernel/process.c
@@ -54,11 +54,6 @@  void enable_hlt(void)
 
 EXPORT_SYMBOL(enable_hlt);
  
-/*
- * The following aren't currently used.
- */
-void (*pm_idle)(void);
-
 extern void default_idle(void);
 
 void (*pm_power_off)(void);
@@ -77,16 +72,12 @@  void cpu_idle (void)
 	while (1) {
 		rcu_idle_enter();
 		while (!need_resched()) {
-			void (*idle)(void);
 			/*
 			 * Mark this as an RCU critical section so that
 			 * synchronize_kernel() in the unload path waits
 			 * for our completion.
 			 */
-			idle = pm_idle;
-			if (!idle)
-				idle = default_idle;
-			idle();
+			default_idle();
 		}
 		rcu_idle_exit();
 		schedule_preempt_disabled();