From ac65d9c90e4cccab2c939b2648e015c93ba3711b Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Sun, 27 Aug 2023 10:43:18 +0200 Subject: [PATCH] parisc: wax: Initialize wax driver via arch_initcall() Signed-off-by: Helge Deller --- drivers/parisc/gsc.c | 4 ---- drivers/parisc/wax.c | 12 +++++++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c index f6a8f26..9511217 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 73a2b01..834dbe9 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 + * (c) 2000-2023 by Helge Deller */ #include @@ -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); -- 2.7.4