Commit f8e4d32c authored by David S. Miller's avatar David S. Miller
Browse files

sparc: Kill sbus_arch_preinit(). 



32-bit sparc just needed it to register the ioport procfs bits, do this
via an arch_initcall() instead.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d32bcdd7

arch/sparc/kernel/ioport.c

+3 −9
Original line number Diff line number Diff line
@@ -393,21 +393,15 @@ void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp) 
#endif

}



int __init sbus_arch_preinit(void)

static int __init sparc_register_ioport(void)

{

	register_proc_sparc_ioport();



#ifdef CONFIG_SUN4

	{

		extern void sun4_dvma_init(void);

		sun4_dvma_init();

	}

	return 1;

#else

	return 0;

#endif

}



arch_initcall(sparc_register_ioport);



void __init sbus_arch_postinit(void)

{

	if (sparc_cpu_model == sun4d) {

arch/sparc64/kernel/sbus.c

+0 −5
Original line number Diff line number Diff line
@@ -655,11 +655,6 @@ void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp) 
	sbus_iommu_init(dp->node, sbus);

}



int __init sbus_arch_preinit(void)

{

	return 0;

}



void __init sbus_arch_postinit(void)

{

	extern void firetruck_init(void);

drivers/sbus/sbus.c

+0 −3
Original line number Diff line number Diff line
@@ -153,9 +153,6 @@ static int __init sbus_init(void) 
	const char *sbus_name = "sbus";

	int num_sbus = 0;



	if (sbus_arch_preinit())

		return 0;



	if (sparc_cpu_model == sun4d)

		sbus_name = "sbi";