diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-27 04:20:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-29 02:15:19 -0700 |
| commit | f8e4d32cb5153a9d6a8e8864e357dad1349f3b85 (patch) | |
| tree | caa92e6dfa504a528f47de9fbb736fcdeac70129 | |
| parent | d32bcdd7a90f19bc067a272b353800108d092c5e (diff) | |
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: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc/kernel/ioport.c | 12 | ||||
| -rw-r--r-- | arch/sparc64/kernel/sbus.c | 5 | ||||
| -rw-r--r-- | drivers/sbus/sbus.c | 3 |
3 files changed, 3 insertions, 17 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index e6177dde103..24645f9f56f 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c @@ -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) { diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c index 0193e382319..0b3e7bc96f6 100644 --- a/arch/sparc64/kernel/sbus.c +++ b/arch/sparc64/kernel/sbus.c @@ -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); diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c index 64c3e45875f..399567b7e15 100644 --- a/drivers/sbus/sbus.c +++ b/drivers/sbus/sbus.c @@ -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"; |