Get rid of early_init. There's more need to make this form of

initialization actually useful and as is certainly unmergable with
upstream.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

2 files changed, 9 insertions, 10 deletions

diff --git a/arch/mips/vr41xx/common/init.c b/arch/mips/vr41xx/common/init.c
index e03be896cbc4..578f6496ffd4 100644
--- a/arch/mips/vr41xx/common/init.c
+++ b/arch/mips/vr41xx/common/init.c
@@ -58,6 +58,14 @@ static void __init timer_init(void)
         board_timer_setup = setup_timer_irq;
 }
 
+void __init plat_setup(void)
+{
+        vr41xx_calculate_clock_frequency();
+
+        timer_init();
+        iomem_resource_init();
+}
+
 void __init prom_init(void)
 {
         int argc, i;
@@ -71,12 +79,6 @@ void __init prom_init(void)
                 if (i < (argc - 1))
                         strcat(arcs_cmdline, " ");
         }
-
-        vr41xx_calculate_clock_frequency();
-
-        timer_init();
-
-        iomem_resource_init();
 }
 
 unsigned long __init prom_free_prom_memory (void)
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/setup.c b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
index db686ce42e85..53272a5c3cbe 100644
--- a/arch/mips/vr41xx/nec-cmbvr4133/setup.c
+++ b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
@@ -56,7 +56,7 @@ static struct mtd_partition cmbvr4133_mtd_parts[] = {
 
 extern void i8259_init(void);
 
-static int __init nec_cmbvr4133_setup(void)
+static void __init nec_cmbvr4133_setup(void)
 {
 #ifdef CONFIG_ROCKHOPPER
         extern void disable_pcnet(void);
@@ -90,7 +90,4 @@ static int __init nec_cmbvr4133_setup(void)
 #ifdef CONFIG_ROCKHOPPER
         i8259_init();
 #endif
-        return 0;
 }
-
-early_initcall(nec_cmbvr4133_setup);