parisc: dino: Convert dino PCI bus 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 e132b2819fc905c32a81680440eabee0dc9421d4..275456ea77581bf7da515aeff63c4c988daeb6e1 100644 (file)
--- a/arch/parisc/include/asm/processor.h
+++ b/arch/parisc/include/asm/processor.h
@@ -317,7 +317,6 @@ extern void gsc_init(void);
 extern void processor_init(void);
 extern void ccio_init(void);
 extern void hppb_init(void);
-extern void dino_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 3e95b5417a506c7a9f1e99c066fba495ffc51a6d..e993ce61716620b04d473302293ffadd18c03a33 100644 (file)
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -311,10 +311,6 @@ static int __init parisc_init(void)
        hppb_init();
 #endif
 
-#if defined(CONFIG_GSC_DINO)
-       dino_init();
-#endif
-
 #ifdef CONFIG_CHASSIS_LCD_LED
        register_led_regions(); /* register LED port info in procfs */
 #endif

diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index f89f9fb4c84bae6d316d1d03d8b894f81cc8a758..01a50a051296eb1fe39e3033aabf6d37aa3aee21 100644 (file)
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -1084,8 +1084,8 @@ static struct parisc_driver dino_driver __refdata = {
  * This is the only routine which is NOT static.
  * Must be called exactly once before pci_init().
  */
-void __init dino_init(void)
+static int __init dino_init(void)
 {
-       register_parisc_driver(&dino_driver);
+       return register_parisc_driver(&dino_driver);
 }
-
+arch_initcall(dino_init);