From: Helge Deller <deller@gmx.de>
Date: Sun, 27 Aug 2023 06:43:52 +0000 (+0200)
Subject: parisc: dino: Convert dino PCI bus driver to use arch_initcall()
X-Git-Tag: v6.6-rc1~160^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07c34e9fdcda868ef33c234e403b88dfb4aa6d8c;p=thirdparty%2Fkernel%2Flinux.git

parisc: dino: Convert dino PCI 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 e132b2819fc90..275456ea77581 100644
--- a/arch/parisc/include/asm/processor.h
+++ b/arch/parisc/include/asm/processor.h
@@ -317,7 +317,6 @@ extern void gsc_init(void);
 extern void processor_init(void);
 extern void ccio_init(void);
 extern void hppb_init(void);
-extern void dino_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 3e95b5417a506..e993ce6171662 100644
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -311,10 +311,6 @@ static int __init parisc_init(void)
 	hppb_init();
 #endif
 
-#if defined(CONFIG_GSC_DINO)
-	dino_init();
-#endif
-
 #ifdef CONFIG_CHASSIS_LCD_LED
 	register_led_regions();	/* register LED port info in procfs */
 #endif
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index f89f9fb4c84ba..01a50a051296e 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -1084,8 +1084,8 @@ static struct parisc_driver dino_driver __refdata = {
  * This is the only routine which is NOT static.
  * Must be called exactly once before pci_init().
  */
-void __init dino_init(void)
+static int __init dino_init(void)
 {
-	register_parisc_driver(&dino_driver);
+	return register_parisc_driver(&dino_driver);
 }
-
+arch_initcall(dino_init);