summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-12-17 08:13:28 +0400
committerNicolas Pitre <nico@fluxnic.net>2012-01-21 03:55:07 +0400
commit20a7b2c15171522d7c5005ff6d4aa1a0e8581e79 (patch)
tree9d2fb881ff249635ed4c11adc41acce7365da88d
parent460863ac23097dde81f101231595518821344a9a (diff)
downloadlinux-20a7b2c15171522d7c5005ff6d4aa1a0e8581e79.tar.xz
ARM: mach-s5pc100: use standard arch_idle()
This is equivalent and more similar to existing architectures. Signed-off-by: Nicolas Pitre <nico@linaro.org>
-rw-r--r--arch/arm/mach-s5pc100/common.c12
-rw-r--r--arch/arm/mach-s5pc100/include/mach/system.h2
2 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/mach-s5pc100/common.c b/arch/arm/mach-s5pc100/common.c
index c9095730a7f5..ff71e2d467c6 100644
--- a/arch/arm/mach-s5pc100/common.c
+++ b/arch/arm/mach-s5pc100/common.c
@@ -129,14 +129,6 @@ static struct map_desc s5pc100_iodesc[] __initdata = {
}
};
-static void s5pc100_idle(void)
-{
- if (!need_resched())
- cpu_do_idle();
-
- local_irq_enable();
-}
-
/*
* s5pc100_map_io
*
@@ -210,10 +202,6 @@ core_initcall(s5pc100_core_init);
int __init s5pc100_init(void)
{
printk(KERN_INFO "S5PC100: Initializing architecture\n");
-
- /* set idle function */
- pm_idle = s5pc100_idle;
-
return device_register(&s5pc100_dev);
}
diff --git a/arch/arm/mach-s5pc100/include/mach/system.h b/arch/arm/mach-s5pc100/include/mach/system.h
index afc96c298518..a09cff95764a 100644
--- a/arch/arm/mach-s5pc100/include/mach/system.h
+++ b/arch/arm/mach-s5pc100/include/mach/system.h
@@ -13,7 +13,7 @@
static void arch_idle(void)
{
- /* nothing here yet */
+ cpu_do_idle();
}
#endif /* __ASM_ARCH_IRQ_H */