From: Helge Deller <deller@gmx.de>
Date: Sun, 27 Aug 2023 06:59:34 +0000 (+0200)
Subject: parisc: eisa: Convert HP EISA bus driver to use arch_initcall()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5f4f870a445790c8ff781a4b9a3e233769d26835;p=linux.git

parisc: eisa: Convert HP EISA bus driver to use arch_initcall()

Signed-off-by: Helge Deller <deller@gmx.de>
---

diff --git a/arch/parisc/include/asm/processor.h b/arch/parisc/include/asm/processor.h
index e0386767c0a4e..b3db85b71e8b3 100644
--- a/arch/parisc/include/asm/processor.h
+++ b/arch/parisc/include/asm/processor.h
@@ -319,7 +319,6 @@ extern void ccio_init(void);
 extern void iosapic_init(void);
 extern void lba_init(void);
 extern void sba_init(void);
-extern void parisc_eisa_init(void);
 struct parisc_device;
 struct resource;
 extern void sba_distributed_lmmio(struct parisc_device *, struct resource *);
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 795486f0a1ea1..733a9010f370b 100644
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -303,9 +303,6 @@ static int __init parisc_init(void)
 #if defined(CONFIG_GSC_LASI) || defined(CONFIG_GSC_WAX)
 	gsc_init();
 #endif
-#ifdef CONFIG_EISA
-	parisc_eisa_init();
-#endif
 
 #ifdef CONFIG_CHASSIS_LCD_LED
 	register_led_regions();	/* register LED port info in procfs */
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c
index 45e487388c6e6..9eab974e6baf6 100644
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
@@ -400,10 +400,11 @@ static struct parisc_driver eisa_driver __refdata = {
 	.probe =	eisa_probe,
 };
 
-void __init parisc_eisa_init(void)
+static int __init parisc_eisa_init(void)
 {
-	register_parisc_driver(&eisa_driver);
+	return register_parisc_driver(&eisa_driver);
 }
+arch_initcall(parisc_eisa_init);
 
 
 static unsigned int eisa_irq_configured;