aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-clps711x/common.c
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2013-05-13 21:07:31 +0400
committerOlof Johansson <olof@lixom.net>2013-06-11 15:47:33 -0700
commitd0ad52a6fa9018d18076a887898f7912ae91f246 (patch)
tree6e9f2eacc6c1306df1ebb9adfd4f02698935b9b5 /arch/arm/mach-clps711x/common.c
parent7e4615cd1ffc5633470b2788345455d288808f4a (diff)
ARM: clps711x: Replace "arch_initcall" in common code with ".init_early"
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-clps711x/common.c')
-rw-r--r--arch/arm/mach-clps711x/common.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c
index f42302e466b..768d41c68ce 100644
--- a/arch/arm/mach-clps711x/common.c
+++ b/arch/arm/mach-clps711x/common.c
@@ -354,15 +354,11 @@ void clps711x_restart(char mode, const char *cmd)
static void clps711x_idle(void)
{
clps_writel(1, HALT);
- __asm__ __volatile__(
- "mov r0, r0\n\
- mov r0, r0");
+ asm("mov r0, r0");
+ asm("mov r0, r0");
}
-static int __init clps711x_idle_init(void)
+void __init clps711x_init_early(void)
{
arm_pm_idle = clps711x_idle;
- return 0;
}
-
-arch_initcall(clps711x_idle_init);