Skip to content

Commit ac65d9c

Browse files
committed
parisc: wax: Initialize wax driver via arch_initcall()
Signed-off-by: Helge Deller <[email protected]>
1 parent 9c2ca10 commit ac65d9c

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

drivers/parisc/gsc.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,16 +261,12 @@ int gsc_common_setup(struct parisc_device *parent, struct gsc_asic *gsc_asic)
261261

262262
extern struct parisc_driver lasi_driver;
263263
extern struct parisc_driver asp_driver;
264-
extern struct parisc_driver wax_driver;
265264

266265
static int __init gsc_init(void)
267266
{
268267
#ifdef CONFIG_GSC_LASI
269268
register_parisc_driver(&lasi_driver);
270269
register_parisc_driver(&asp_driver);
271-
#endif
272-
#ifdef CONFIG_GSC_WAX
273-
register_parisc_driver(&wax_driver);
274270
#endif
275271
return 0;
276272
}

drivers/parisc/wax.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* (c) Copyright 2000 The Puffin Group Inc.
66
*
7-
* by Helge Deller <[email protected]>
7+
* (c) 2000-2023 by Helge Deller <[email protected]>
88
*/
99

1010
#include <linux/errno.h>
@@ -121,14 +121,20 @@ static int __init wax_init_chip(struct parisc_device *dev)
121121
}
122122

123123
static const struct parisc_device_id wax_tbl[] __initconst = {
124-
{ HPHW_BA, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0008e },
124+
{ HPHW_BA, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0008e },
125125
{ 0, }
126126
};
127127

128128
MODULE_DEVICE_TABLE(parisc, wax_tbl);
129129

130-
struct parisc_driver wax_driver __refdata = {
130+
static struct parisc_driver wax_driver __refdata = {
131131
.name = "wax",
132132
.id_table = wax_tbl,
133133
.probe = wax_init_chip,
134134
};
135+
136+
static int __init wax_init(void)
137+
{
138+
return register_parisc_driver(&wax_driver);
139+
}
140+
arch_initcall(wax_init);

0 commit comments

Comments
 (0)