diff options
| author | Helge Deller <deller@gmx.de> | 2023-08-27 09:25:48 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2023-08-27 09:25:48 +0200 |
| commit | df3f93596c8ffb97482bb6d90f4933d7417605aa (patch) | |
| tree | e447ae737536aae5eba3e7dceb0528e5349792b8 | |
| parent | ba8723b1edf9dbd4c10a739375a60506fd00652b (diff) | |
| download | cloudkernel-df3f93596c8ffb97482bb6d90f4933d7417605aa.tar.gz | |
parisc: lba: Convert LBA 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 | 3 | ||||
| -rw-r--r-- | drivers/parisc/lba_pci.c | 5 |
3 files changed, 3 insertions, 6 deletions
diff --git a/arch/parisc/include/asm/processor.h b/arch/parisc/include/asm/processor.h index 44e9a03fd778b0..c6a526b6353ce2 100644 --- a/arch/parisc/include/asm/processor.h +++ b/arch/parisc/include/asm/processor.h @@ -315,7 +315,6 @@ extern int show_cpuinfo (struct seq_file *m, void *v); /* driver code in driver/parisc */ extern void processor_init(void); extern void iosapic_init(void); -extern void lba_init(void); extern void sba_init(void); struct parisc_device; struct resource; diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 444357815c2d02..3b8ba550f0296f 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c @@ -286,9 +286,6 @@ static int __init parisc_init(void) #if defined(CONFIG_IOMMU_SBA) sba_init(); #endif -#if defined(CONFIG_PCI_LBA) - lba_init(); -#endif #ifdef CONFIG_CHASSIS_LCD_LED register_led_regions(); /* register LED port info in procfs */ diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index 9e22b117fb3a49..3fc3765fddaaff 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c @@ -1682,10 +1682,11 @@ static struct parisc_driver lba_driver __refdata = { ** One time initialization to let the world know the LBA was found. ** Must be called exactly once before pci_init(). */ -void __init lba_init(void) +static int __init lba_init(void) { - register_parisc_driver(&lba_driver); + return register_parisc_driver(&lba_driver); } +arch_initcall(lba_init); /* ** Initialize the IBASE/IMASK registers for LBA (Elroy). |