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>

diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index e6177dde103ba1c6fca2b82f6ae77fd62a2e5025..24645f9f56f5e85fa948022e140baa571a29b2ee 100644 (file)
--- 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 0193e38231963624bd49544fc290ba97a562609e..0b3e7bc96f6104c7d1f543bac406b38fe15488e4 100644 (file)
--- 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 64c3e45875ff3362a1e361c9b1227bf7f76c3ffd..399567b7e15e9e88ddef78ce69dba7773e97b816 100644 (file)
--- 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";