parisc: sba_iommu: Convert SBA IOMMU driver to use arch_initcall()

Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/arch/parisc/include/asm/processor.h b/arch/parisc/include/asm/processor.h
index c6a526b6353ce2c5667ff8635aec3e522594dd6e..eb0ecd9b56218816de20c1f5219130be02b2370a 100644 (file)
--- a/arch/parisc/include/asm/processor.h
+++ b/arch/parisc/include/asm/processor.h
@@ -315,7 +315,6 @@ extern int show_cpuinfo (struct seq_file *m, void *v);
 /* driver code in driver/parisc */
 extern void processor_init(void);
 extern void iosapic_init(void);
-extern void sba_init(void);
 struct parisc_device;
 struct resource;
 extern void sba_distributed_lmmio(struct parisc_device *, struct resource *);

diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index ef642a2ade9643ff1eb7ea07ae1573dd2fe7be43..84a1dce6c757033051ae74522fa1206ca49410e9 100644 (file)
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -282,9 +282,6 @@ static int __init parisc_init(void)
        /* These are in a non-obvious order, will fix when we have an iotree */
 #if defined(CONFIG_IOSAPIC)
        iosapic_init();
-#endif
-#if defined(CONFIG_IOMMU_SBA)
-       sba_init();
 #endif
        return 0;
 }

diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 8b1dcd537020f5c78937660ba44715945a7d050c..33da29d65f301767ec98e0eb874937ce95de4c12 100644 (file)
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1994,10 +1994,11 @@ static int __init sba_driver_callback(struct parisc_device *dev)
 ** This is the only routine which is NOT static.
 ** Must be called exactly once before pci_init().
 */
-void __init sba_init(void)
+static int __init sba_init(void)
 {
-       register_parisc_driver(&sba_driver);
+       return register_parisc_driver(&sba_driver);
 }
+arch_initcall(sba_init);
 
 
 /**