diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-12-16 23:13:28 -0500 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2012-01-20 18:55:07 -0500 |
commit | 20a7b2c15171522d7c5005ff6d4aa1a0e8581e79 (patch) | |
tree | 9d2fb881ff249635ed4c11adc41acce7365da88d /arch/arm | |
parent | 460863ac23097dde81f101231595518821344a9a (diff) |
ARM: mach-s5pc100: 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/arm')
-rw-r--r-- | arch/arm/mach-s5pc100/common.c | 12 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/include/mach/system.h | 2 |
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 = { | |||
129 | } | 129 | } |
130 | }; | 130 | }; |
131 | 131 | ||
132 | static void s5pc100_idle(void) | ||
133 | { | ||
134 | if (!need_resched()) | ||
135 | cpu_do_idle(); | ||
136 | |||
137 | local_irq_enable(); | ||
138 | } | ||
139 | |||
140 | /* | 132 | /* |
141 | * s5pc100_map_io | 133 | * s5pc100_map_io |
142 | * | 134 | * |
@@ -210,10 +202,6 @@ core_initcall(s5pc100_core_init); | |||
210 | int __init s5pc100_init(void) | 202 | int __init s5pc100_init(void) |
211 | { | 203 | { |
212 | printk(KERN_INFO "S5PC100: Initializing architecture\n"); | 204 | printk(KERN_INFO "S5PC100: Initializing architecture\n"); |
213 | |||
214 | /* set idle function */ | ||
215 | pm_idle = s5pc100_idle; | ||
216 | |||
217 | return device_register(&s5pc100_dev); | 205 | return device_register(&s5pc100_dev); |
218 | } | 206 | } |
219 | 207 | ||
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 @@ | |||
13 | 13 | ||
14 | static void arch_idle(void) | 14 | static void arch_idle(void) |
15 | { | 15 | { |
16 | /* nothing here yet */ | 16 | cpu_do_idle(); |
17 | } | 17 | } |
18 | 18 | ||
19 | #endif /* __ASM_ARCH_IRQ_H */ | 19 | #endif /* __ASM_ARCH_IRQ_H */ |