summaryrefslogtreecommitdiff
path: root/drivers/parisc
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2023-08-27 11:03:20 +0200
committerHelge Deller <deller@gmx.de>2023-08-27 11:09:10 +0200
commitd75ef5994db384856f1590ecac2ad38ebcde1a4a (patch)
tree54efbfc18c4034b4f9cef4768afb0a144112e765 /drivers/parisc
parentff0e833e98ee382e718a0a8a9433a3568fede4ab (diff)
parisc: lasi: Initialize LASI driver via arch_initcall()
Move initialization code for LASI out of the GSC driver. Since ASP and WAX have been moved in previous commits, the GSC driver is now just a driver which provides library functions for LASI, ASP and WAX and as such doesn't need an own initialization function any longer. Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'drivers/parisc')
-rw-r--r--drivers/parisc/gsc.c11
-rw-r--r--drivers/parisc/lasi.c9
2 files changed, 8 insertions, 12 deletions
diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c
index 5643c46a4255..a0daaa548bc3 100644
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
@@ -258,14 +258,3 @@ int gsc_common_setup(struct parisc_device *parent, struct gsc_asic *gsc_asic)
return 0;
}
-
-extern struct parisc_driver lasi_driver;
-
-static int __init gsc_init(void)
-{
-#ifdef CONFIG_GSC_LASI
- register_parisc_driver(&lasi_driver);
-#endif
- return 0;
-}
-arch_initcall(gsc_init);
diff --git a/drivers/parisc/lasi.c b/drivers/parisc/lasi.c
index d7331823255f..73c93e9cfa51 100644
--- a/drivers/parisc/lasi.c
+++ b/drivers/parisc/lasi.c
@@ -220,9 +220,16 @@ static struct parisc_device_id lasi_tbl[] __initdata = {
{ HPHW_BA, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00081 },
{ 0, }
};
+MODULE_DEVICE_TABLE(parisc, lasi_tbl);
-struct parisc_driver lasi_driver __refdata = {
+static struct parisc_driver lasi_driver __refdata = {
.name = "lasi",
.id_table = lasi_tbl,
.probe = lasi_init_chip,
};
+
+static int __init lasi_init(void)
+{
+ return register_parisc_driver(&lasi_driver);
+}
+arch_initcall(lasi_init);