diff options
| author | Len Brown <len.brown@intel.com> | 2013-02-09 22:52:57 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2013-02-17 23:34:59 -0500 |
| commit | 3738fa5bbc3acaf6a807cb45f4367cbab412faee (patch) | |
| tree | 674d7a710d39f5c40d409d445fe386ca04d38981 /arch/sh | |
| parent | a476bda30baf7efa7f305793a340aae07b6e5780 (diff) | |
| download | linux-3738fa5bbc3acaf6a807cb45f4367cbab412faee.tar.gz | |
sh idle: rename global pm_idle to static sh_idle
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
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/idle.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c index 0c910163caa3..3d5a1b387cc0 100644 --- a/arch/sh/kernel/idle.c +++ b/arch/sh/kernel/idle.c @@ -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) |