parisc: gsc: Convert GSC bus driver to use arch_initcall()

This conversion includes LASI, ASP and WAX drivers for now.

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 215f4d03ba2ab4d01f7f346144c9369275612581..44e9a03fd778b084688b74830b2ca4bb64e89b7d 100644 (file)
--- a/arch/parisc/include/asm/processor.h
+++ b/arch/parisc/include/asm/processor.h
@@ -313,7 +313,6 @@ extern void collect_boot_cpu_data(void);
 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 iosapic_init(void);
 extern void lba_init(void);

diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 86771ba893b67c70fe4ae3005fa5f8d7fdc370fb..444357815c2d02d99f8a1faa51eb3671be0382fd 100644 (file)
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -290,10 +290,6 @@ static int __init parisc_init(void)
        lba_init();
 #endif
 
-#if defined(CONFIG_GSC_LASI) || defined(CONFIG_GSC_WAX)
-       gsc_init();
-#endif
-
 #ifdef CONFIG_CHASSIS_LCD_LED
        register_led_regions(); /* register LED port info in procfs */
 #endif

diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c
index ec175ae998733bb69f90217eb2794e25d66e9ab5..f6a8f26d8c405e41d9709e48cdbc292bc81d38a4 100644 (file)
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
@@ -263,7 +263,7 @@ extern struct parisc_driver lasi_driver;
 extern struct parisc_driver asp_driver;
 extern struct parisc_driver wax_driver;
 
-void __init gsc_init(void)
+static int __init gsc_init(void)
 {
 #ifdef CONFIG_GSC_LASI
        register_parisc_driver(&lasi_driver);
@@ -272,4 +272,6 @@ void __init gsc_init(void)
 #ifdef CONFIG_GSC_WAX
        register_parisc_driver(&wax_driver);
 #endif
+       return 0;
 }
+arch_initcall(gsc_init);