evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sparc: Kill sbus_arch_preinit().

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

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2008-08-27 04:20:14 -07:00
parent d32bcdd7a9
commit f8e4d32cb5
3 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/sparc/kernel/ioport.c
View file

@ -393,21 +393,15 @@ void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)
#endif #endif
} }
int __init sbus_arch_preinit(void) static int __init sparc_register_ioport(void)
{ {
register_proc_sparc_ioport(); register_proc_sparc_ioport();
#ifdef CONFIG_SUN4
{
extern void sun4_dvma_init(void);
sun4_dvma_init();
}
return 1;
#else
return 0; return 0;
#endif
} }
arch_initcall(sparc_register_ioport);
void __init sbus_arch_postinit(void) void __init sbus_arch_postinit(void)
{ {
if (sparc_cpu_model == sun4d) { if (sparc_cpu_model == sun4d) {

5
arch/sparc64/kernel/sbus.c
View file

@ -655,11 +655,6 @@ void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)
sbus_iommu_init(dp->node, sbus); sbus_iommu_init(dp->node, sbus);
} }
int __init sbus_arch_preinit(void)
{
return 0;
}
void __init sbus_arch_postinit(void) void __init sbus_arch_postinit(void)
{ {
extern void firetruck_init(void); extern void firetruck_init(void);

3
drivers/sbus/sbus.c
View file

@ -153,9 +153,6 @@ static int __init sbus_init(void)
const char *sbus_name = "sbus"; const char *sbus_name = "sbus";
int num_sbus = 0; int num_sbus = 0;
if (sbus_arch_preinit())
return 0;
if (sparc_cpu_model == sun4d) if (sparc_cpu_model == sun4d)
sbus_name = "sbi"; sbus_name = "sbi";