From d75ef5994db384856f1590ecac2ad38ebcde1a4a Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Sun, 27 Aug 2023 11:03:20 +0200 Subject: 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 --- drivers/parisc/gsc.c | 11 ----------- drivers/parisc/lasi.c | 9 ++++++++- 2 files changed, 8 insertions(+), 12 deletions(-) (limited to 'drivers/parisc') 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); -- cgit