Skip to content

Commit 53861a9

Browse files
committed
parisc: sba_iommu: Convert SBA IOMMU driver to use arch_initcall()
Signed-off-by: Helge Deller <[email protected]>
1 parent 3b425dd commit 53861a9

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
@@ -315,7 +315,6 @@ extern int show_cpuinfo (struct seq_file *m, void *v);
315315
/* driver code in driver/parisc */
316316
extern void processor_init(void);
317317
extern void iosapic_init(void);
318-
extern void sba_init(void);
319318
struct parisc_device;
320319
struct resource;
321320
extern void sba_distributed_lmmio(struct parisc_device *, struct resource *);

arch/parisc/kernel/setup.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,6 @@ static int __init parisc_init(void)
282282
/* These are in a non-obvious order, will fix when we have an iotree */
283283
#if defined(CONFIG_IOSAPIC)
284284
iosapic_init();
285-
#endif
286-
#if defined(CONFIG_IOMMU_SBA)
287-
sba_init();
288285
#endif
289286
return 0;
290287
}

drivers/parisc/sba_iommu.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1994,10 +1994,11 @@ static int __init sba_driver_callback(struct parisc_device *dev)
19941994
** This is the only routine which is NOT static.
19951995
** Must be called exactly once before pci_init().
19961996
*/
1997-
void __init sba_init(void)
1997+
static int __init sba_init(void)
19981998
{
1999-
register_parisc_driver(&sba_driver);
1999+
return register_parisc_driver(&sba_driver);
20002000
}
2001+
arch_initcall(sba_init);
20012002

20022003

20032004
/**

0 commit comments

Comments
 (0)