Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d884297a authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

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: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1b6d06d8

arch/sparc/include/asm/leon.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

arch/sparc/kernel/leon_kernel.c

+0 −16
Original line number Diff line number Diff line
@@ -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;

}

arch/sparc/mm/init_32.c

+0 −2
Original line number Diff line number Diff line
@@ -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();