Skip to content

Commit 07c34e9

Browse files
committed
parisc: dino: Convert dino PCI bus driver to use arch_initcall()
Signed-off-by: Helge Deller <[email protected]>
1 parent 59bf860 commit 07c34e9

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

arch/parisc/include/asm/processor.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ extern void gsc_init(void);
317317
extern void processor_init(void);
318318
extern void ccio_init(void);
319319
extern void hppb_init(void);
320-
extern void dino_init(void);
321320
extern void iosapic_init(void);
322321
extern void lba_init(void);
323322
extern void sba_init(void);

arch/parisc/kernel/setup.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,6 @@ static int __init parisc_init(void)
311311
hppb_init();
312312
#endif
313313

314-
#if defined(CONFIG_GSC_DINO)
315-
dino_init();
316-
#endif
317-
318314
#ifdef CONFIG_CHASSIS_LCD_LED
319315
register_led_regions(); /* register LED port info in procfs */
320316
#endif

drivers/parisc/dino.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,8 +1084,8 @@ static struct parisc_driver dino_driver __refdata = {
10841084
* This is the only routine which is NOT static.
10851085
* Must be called exactly once before pci_init().
10861086
*/
1087-
void __init dino_init(void)
1087+
static int __init dino_init(void)
10881088
{
1089-
register_parisc_driver(&dino_driver);
1089+
return register_parisc_driver(&dino_driver);
10901090
}
1091-
1091+
arch_initcall(dino_init);

0 commit comments

Comments
 (0)