Skip to content

Commit ba8723b

Browse files
committed
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 <[email protected]>
1 parent 63c1ce5 commit ba8723b

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

arch/parisc/include/asm/processor.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ extern void collect_boot_cpu_data(void);
313313
extern int show_cpuinfo (struct seq_file *m, void *v);
314314

315315
/* driver code in driver/parisc */
316-
extern void gsc_init(void);
317316
extern void processor_init(void);
318317
extern void iosapic_init(void);
319318
extern void lba_init(void);

arch/parisc/kernel/setup.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,6 @@ static int __init parisc_init(void)
290290
lba_init();
291291
#endif
292292

293-
#if defined(CONFIG_GSC_LASI) || defined(CONFIG_GSC_WAX)
294-
gsc_init();
295-
#endif
296-
297293
#ifdef CONFIG_CHASSIS_LCD_LED
298294
register_led_regions(); /* register LED port info in procfs */
299295
#endif

drivers/parisc/gsc.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ extern struct parisc_driver lasi_driver;
263263
extern struct parisc_driver asp_driver;
264264
extern struct parisc_driver wax_driver;
265265

266-
void __init gsc_init(void)
266+
static int __init gsc_init(void)
267267
{
268268
#ifdef CONFIG_GSC_LASI
269269
register_parisc_driver(&lasi_driver);
@@ -272,4 +272,6 @@ void __init gsc_init(void)
272272
#ifdef CONFIG_GSC_WAX
273273
register_parisc_driver(&wax_driver);
274274
#endif
275+
return 0;
275276
}
277+
arch_initcall(gsc_init);

0 commit comments

Comments
 (0)