parisc: ccio: Convert CCIO 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 b3db85b..215f4d0 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 gsc_init(void);
 extern void processor_init(void);
-extern void ccio_init(void);
 extern void iosapic_init(void);
 extern void lba_init(void);
 extern void sba_init(void);

diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 733a901..86771ba 100644 (file)
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -290,16 +290,6 @@ static int __init parisc_init(void)
        lba_init();
 #endif
 
-       /* CCIO before any potential subdevices */
-#if defined(CONFIG_IOMMU_CCIO)
-       ccio_init();
-#endif
-
-       /*
-        * Need to register Asp & Wax before the EISA adapters for the IRQ
-        * regions.  EISA must come before PCI to be sure it gets IRQ region
-        * 0.
-        */
 #if defined(CONFIG_GSC_LASI) || defined(CONFIG_GSC_WAX)
        gsc_init();
 #endif

diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 9bf652b..bd92856 100644 (file)
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -8,18 +8,10 @@
 **     (c) Copyright 2000 Ryan Bradetich
 **     (c) Copyright 2000 Hewlett-Packard Company
 **
-**
-**
 **  "Real Mode" operation refers to U2/Uturn chip operation.
 **  U2/Uturn were designed to perform coherency checks w/o using
 **  the I/O MMU - basically what x86 does.
 **
-**  Philipp Rumpf has a "Real Mode" driver for PCX-W machines at:
-**      CVSROOT=:pserver:anonymous@198.186.203.37:/cvsroot/linux-parisc
-**      cvs -z3 co linux/arch/parisc/kernel/dma-rm.c
-**
-**  I've rewritten his code to work under TPG's tree. See ccio-rm-dma.c.
-**
 **  Drawbacks of using Real Mode are:
 **     o outbound DMA is slower - U2 won't prefetch data (GSC+ XQL signal).
 **      o Inbound DMA less efficient - U2 can't use DMA_FAST attribute.
@@ -1582,8 +1574,8 @@ static int __init ccio_probe(struct parisc_device *dev)
  *
  * Register this driver.
  */
-void __init ccio_init(void)
+static int __init ccio_init(void)
 {
-       register_parisc_driver(&ccio_driver);
+       return register_parisc_driver(&ccio_driver);
 }
-
+arch_initcall(ccio_init);