From: Greg Ungerer <gerg@uclinux.org>
Date: Sat, 24 Dec 2011 03:04:05 +0000 (+1000)
Subject: m68knommu: clean up init code in ColdFire 528x startup
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9773be5f5fcbabb688bf05f85d594261a53a5ac0;p=mv-sheeva.git

m68knommu: clean up init code in ColdFire 528x startup

We can move all the init calls in the initcall code into the more general
arch setup code (which is config_BSP() here). That makes the 528x consistent
with other ColdFire CPUs setup cod. It means we can get rif of the initcall
setup here all together.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---

diff --git a/arch/m68k/platform/528x/config.c b/arch/m68k/platform/528x/config.c
index 264456ce45d..98decc6beb3 100644
--- a/arch/m68k/platform/528x/config.c
+++ b/arch/m68k/platform/528x/config.c
@@ -103,12 +103,6 @@ void __init config_BSP(char *commandp, int size)
 #ifdef CONFIG_WILDFIREMOD
 	mach_halt = wildfiremod_halt;
 #endif
-}
-
-/***************************************************************************/
-
-static int __init init_BSP(void)
-{
 	mach_reset = m528x_cpu_reset;
 	mach_sched_init = hw_timer_init;
 	m528x_uarts_init();
@@ -116,9 +110,6 @@ static int __init init_BSP(void)
 #ifdef CONFIG_SPI_COLDFIRE_QSPI
 	m528x_qspi_init();
 #endif
-	return 0;
 }
 
-arch_initcall(init_BSP);
-
 /***************************************************************************/