Skip to content

Commit df3f935

Browse files
committed
parisc: lba: Convert LBA PCI bus driver to use arch_initcall()
Signed-off-by: Helge Deller <[email protected]>
1 parent ba8723b commit df3f935

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 lba_init(void);
319318
extern void sba_init(void);
320319
struct parisc_device;
321320
struct resource;

arch/parisc/kernel/setup.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,6 @@ static int __init parisc_init(void)
286286
#if defined(CONFIG_IOMMU_SBA)
287287
sba_init();
288288
#endif
289-
#if defined(CONFIG_PCI_LBA)
290-
lba_init();
291-
#endif
292289

293290
#ifdef CONFIG_CHASSIS_LCD_LED
294291
register_led_regions(); /* register LED port info in procfs */

drivers/parisc/lba_pci.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1682,10 +1682,11 @@ static struct parisc_driver lba_driver __refdata = {
16821682
** One time initialization to let the world know the LBA was found.
16831683
** Must be called exactly once before pci_init().
16841684
*/
1685-
void __init lba_init(void)
1685+
static int __init lba_init(void)
16861686
{
1687-
register_parisc_driver(&lba_driver);
1687+
return register_parisc_driver(&lba_driver);
16881688
}
1689+
arch_initcall(lba_init);
16891690

16901691
/*
16911692
** Initialize the IBASE/IMASK registers for LBA (Elroy).

0 commit comments

Comments
 (0)