sparc32,leon: drop leon_init()

This function was only used to set of_pdt_build_more to leon_node_init().
But the leon_node_init() was a nop as prom_amba_init was never assigned.

Cc: Daniel Hellstrom <daniel@gaisler.com>
Cc: Konrad Eisele <konrad@gaisler.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h
index 3375c6293893654bfb0ab46a41ee084ccd3d8cc6..15a716934e4dd790d589678af3ae58369d81ddf6 100644 (file)
--- a/arch/sparc/include/asm/leon.h
+++ b/arch/sparc/include/asm/leon.h
@@ -82,7 +82,6 @@ static inline unsigned long leon_load_reg(unsigned long paddr)
 #define LEON_BYPASS_LOAD_PA(x)      leon_load_reg((unsigned long)(x))
 #define LEON_BYPASS_STORE_PA(x, v)  leon_store_reg((unsigned long)(x), (unsigned long)(v))
 
-extern void leon_init(void);
 extern void leon_switch_mm(void);
 extern void leon_init_IRQ(void);
 

diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c
index e34e2c40c0609eac5b41b7220f01304cd2373e20..f8b6eee40bde6596cdd9043e46aa9c9ef908fa4c 100644 (file)
--- a/arch/sparc/kernel/leon_kernel.c
+++ b/arch/sparc/kernel/leon_kernel.c
@@ -486,17 +486,6 @@ void __init leon_trans_init(struct device_node *dp)
        }
 }
 
-void __initdata (*prom_amba_init)(struct device_node *dp, struct device_node ***nextp) = 0;
-
-void __init leon_node_init(struct device_node *dp, struct device_node ***nextp)
-{
-       if (prom_amba_init &&
-           strcmp(dp->type, "ambapp") == 0 &&
-           strcmp(dp->name, "ambapp0") == 0) {
-               prom_amba_init(dp, nextp);
-       }
-}
-
 #ifdef CONFIG_SMP
 void leon_clear_profile_irq(int cpu)
 {
@@ -522,8 +511,3 @@ void __init leon_init_IRQ(void)
        sparc_config.clear_clock_irq  = leon_clear_clock_irq;
        sparc_config.load_profile_irq = leon_load_profile_irq;
 }
-
-void __init leon_init(void)
-{
-       of_pdt_build_more = &leon_node_init;
-}

diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index ef5c779ec855d726b40a1253a9d51fb43d70f1af..e8ea360a4d9b0ca34a60025c8fab9a3a0461120e 100644 (file)
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -294,8 +294,6 @@ void __init paging_init(void)
 {
        switch(sparc_cpu_model) {
        case sparc_leon:
-               leon_init();
-               /* fall through */
        case sun4m:
        case sun4d:
                srmmu_paging_init();