summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-12-16 23:13:28 -0500
committerNicolas Pitre <nico@fluxnic.net>2012-01-20 18:55:07 -0500
commit460863ac23097dde81f101231595518821344a9a (patch)
treeb8f42df7c1e9b445c951c9cc808269fce12a62f3 /arch
parent0bcd24b0f414003c695e2ecf16b9ffa14d184f48 (diff)
downloadlinux-stable-460863ac23097dde81f101231595518821344a9a.tar.gz
linux-stable-460863ac23097dde81f101231595518821344a9a.tar.bz2
linux-stable-460863ac23097dde81f101231595518821344a9a.zip
ARM: mach-s5pv210: use standard arch_idle()
This is equivalent and more similar to existing architectures. Signed-off-by: Nicolas Pitre <nico@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s5pv210/common.c12
-rw-r--r--arch/arm/mach-s5pv210/include/mach/system.h2
2 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c
index 9c1bcdcc12c3..4c9e9027df9a 100644
--- a/arch/arm/mach-s5pv210/common.c
+++ b/arch/arm/mach-s5pv210/common.c
@@ -142,14 +142,6 @@ static struct map_desc s5pv210_iodesc[] __initdata = {
}
};
-static void s5pv210_idle(void)
-{
- if (!need_resched())
- cpu_do_idle();
-
- local_irq_enable();
-}
-
void s5pv210_restart(char mode, const char *cmd)
{
__raw_writel(0x1, S5P_SWRESET);
@@ -247,10 +239,6 @@ core_initcall(s5pv210_core_init);
int __init s5pv210_init(void)
{
printk(KERN_INFO "S5PV210: Initializing architecture\n");
-
- /* set idle function */
- pm_idle = s5pv210_idle;
-
return device_register(&s5pv210_dev);
}
diff --git a/arch/arm/mach-s5pv210/include/mach/system.h b/arch/arm/mach-s5pv210/include/mach/system.h
index bf288ced860a..50248f281e27 100644
--- a/arch/arm/mach-s5pv210/include/mach/system.h
+++ b/arch/arm/mach-s5pv210/include/mach/system.h
@@ -15,7 +15,7 @@
static void arch_idle(void)
{
- /* nothing here yet */
+ cpu_do_idle();
}
#endif /* __ASM_ARCH_SYSTEM_H */