summaryrefslogtreecommitdiff
path: root/drivers/parisc
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2023-08-27 10:43:18 +0200
committerHelge Deller <deller@gmx.de>2023-08-27 11:09:10 +0200
commitac65d9c90e4cccab2c939b2648e015c93ba3711b (patch)
tree45df60ababf3b4bc3f4b15dec3ef455e585e0cd3 /drivers/parisc
parent9c2ca106c9fecea2f1564ccc276b3db1f2ab25e8 (diff)
parisc: wax: Initialize wax driver via arch_initcall()
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'drivers/parisc')
-rw-r--r--drivers/parisc/gsc.c4
-rw-r--r--drivers/parisc/wax.c12
2 files changed, 9 insertions, 7 deletions
diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c
index f6a8f26d8c40..95112176c546 100644
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
@@ -261,7 +261,6 @@ int gsc_common_setup(struct parisc_device *parent, struct gsc_asic *gsc_asic)
extern struct parisc_driver lasi_driver;
extern struct parisc_driver asp_driver;
-extern struct parisc_driver wax_driver;
static int __init gsc_init(void)
{
@@ -269,9 +268,6 @@ static int __init gsc_init(void)
register_parisc_driver(&lasi_driver);
register_parisc_driver(&asp_driver);
#endif
-#ifdef CONFIG_GSC_WAX
- register_parisc_driver(&wax_driver);
-#endif
return 0;
}
arch_initcall(gsc_init);
diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c
index 73a2b01f8d9c..834dbe9a767b 100644
--- a/drivers/parisc/wax.c
+++ b/drivers/parisc/wax.c
@@ -4,7 +4,7 @@
*
* (c) Copyright 2000 The Puffin Group Inc.
*
- * by Helge Deller <deller@gmx.de>
+ * (c) 2000-2023 by Helge Deller <deller@gmx.de>
*/
#include <linux/errno.h>
@@ -121,14 +121,20 @@ static int __init wax_init_chip(struct parisc_device *dev)
}
static const struct parisc_device_id wax_tbl[] __initconst = {
- { HPHW_BA, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0008e },
+ { HPHW_BA, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0008e },
{ 0, }
};
MODULE_DEVICE_TABLE(parisc, wax_tbl);
-struct parisc_driver wax_driver __refdata = {
+static struct parisc_driver wax_driver __refdata = {
.name = "wax",
.id_table = wax_tbl,
.probe = wax_init_chip,
};
+
+static int __init wax_init(void)
+{
+ return register_parisc_driver(&wax_driver);
+}
+arch_initcall(wax_init);