]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
sh idle: rename global pm_idle to static sh_idle
authorLen Brown <len.brown@intel.com>
Sun, 10 Feb 2013 03:52:57 +0000 (22:52 -0500)
committerLen Brown <len.brown@intel.com>
Mon, 18 Feb 2013 04:34:59 +0000 (23:34 -0500)
SH idle code could use some simplification.
This patch enables that by guaranteeing
that "sh_idle" is local, and thus architecture specific.

Signed-off-by: Len Brown <len.brown@intel.com>
Cc: linux-sh@vger.kernel.org
arch/sh/kernel/idle.c

index 0c910163caa36d47436d1cb81f3974d20d11aeea..3d5a1b387cc0f48b23d569779769a39f735a0664 100644 (file)
@@ -22,7 +22,7 @@
 #include <asm/smp.h>
 #include <asm/bl_bit.h>
 
-void (*pm_idle)(void);
+static void (*sh_idle)(void);
 
 static int hlt_counter;
 
@@ -103,9 +103,9 @@ void cpu_idle(void)
                        /* Don't trace irqs off for idle */
                        stop_critical_timings();
                        if (cpuidle_idle_call())
-                               pm_idle();
+                               sh_idle();
                        /*
-                        * Sanity check to ensure that pm_idle() returns
+                        * Sanity check to ensure that sh_idle() returns
                         * with IRQs enabled
                         */
                        WARN_ON(irqs_disabled());
@@ -123,13 +123,13 @@ void __init select_idle_routine(void)
        /*
         * If a platform has set its own idle routine, leave it alone.
         */
-       if (pm_idle)
+       if (sh_idle)
                return;
 
        if (hlt_works())
-               pm_idle = default_idle;
+               sh_idle = default_idle;
        else
-               pm_idle = poll_idle;
+               sh_idle = poll_idle;
 }
 
 void stop_this_cpu(void *unused)