diff options
| author | Helge Deller <deller@gmx.de> | 2023-08-27 08:43:52 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2023-08-27 09:17:37 +0200 |
| commit | 07c34e9fdcda868ef33c234e403b88dfb4aa6d8c (patch) | |
| tree | 790ac027e97392ed98c1013dd9dc84f00ed60801 | |
| parent | 59bf860a97c152efff6b357009bb2016caa46552 (diff) | |
parisc: dino: Convert dino PCI bus driver to use arch_initcall()
Signed-off-by: Helge Deller <deller@gmx.de>
| -rw-r--r-- | arch/parisc/include/asm/processor.h | 1 | ||||
| -rw-r--r-- | arch/parisc/kernel/setup.c | 4 | ||||
| -rw-r--r-- | drivers/parisc/dino.c | 6 |
3 files changed, 3 insertions, 8 deletions
diff --git a/arch/parisc/include/asm/processor.h b/arch/parisc/include/asm/processor.h index e132b2819fc9..275456ea7758 100644 --- 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 3e95b5417a50..e993ce617166 100644 --- 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 f89f9fb4c84b..01a50a051296 100644 --- 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); |