summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2023-08-27 08:56:16 +0200
committerHelge Deller <deller@gmx.de>2023-08-27 09:17:37 +0200
commit49663185d050ddb4b2bc3297c04c976078c4911f (patch)
tree8ec77ac62ba3703e274b2a822841ba307c993e00
parentparisc: dino: Convert dino PCI bus driver to use arch_initcall() (diff)
downloadlinux-49663185d050ddb4b2bc3297c04c976078c4911f.tar.xz
linux-49663185d050ddb4b2bc3297c04c976078c4911f.zip
parisc: hppb: Convert HP PB bus driver to use arch_initcall()
Signed-off-by: Helge Deller <deller@gmx.de>
-rw-r--r--arch/parisc/include/asm/processor.h1
-rw-r--r--arch/parisc/kernel/setup.c4
-rw-r--r--drivers/parisc/hppb.c7
3 files changed, 4 insertions, 8 deletions
diff --git a/arch/parisc/include/asm/processor.h b/arch/parisc/include/asm/processor.h
index 275456ea7758..e0386767c0a4 100644
--- a/arch/parisc/include/asm/processor.h
+++ b/arch/parisc/include/asm/processor.h
@@ -316,7 +316,6 @@ extern int show_cpuinfo (struct seq_file *m, void *v);
extern void gsc_init(void);
extern void processor_init(void);
extern void ccio_init(void);
-extern void hppb_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 e993ce617166..795486f0a1ea 100644
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -307,10 +307,6 @@ static int __init parisc_init(void)
parisc_eisa_init();
#endif
-#if defined(CONFIG_HPPB)
- hppb_init();
-#endif
-
#ifdef CONFIG_CHASSIS_LCD_LED
register_led_regions(); /* register LED port info in procfs */
#endif
diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c
index e60e68664654..0f9d80384e3d 100644
--- a/drivers/parisc/hppb.c
+++ b/drivers/parisc/hppb.c
@@ -96,9 +96,10 @@ static struct parisc_driver hppb_driver __refdata = {
/**
* hppb_init - HP-PB bus initialization procedure.
*
- * Register this driver.
+ * Register this driver.
*/
-void __init hppb_init(void)
+static int __init hppb_init(void)
{
- register_parisc_driver(&hppb_driver);
+ return register_parisc_driver(&hppb_driver);
}
+arch_initcall(hppb_init);