Skip to content

Commit ff0e833

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

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

drivers/parisc/asp.c

Lines changed: 9 additions & 2 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>
@@ -118,9 +118,16 @@ static const struct parisc_device_id asp_tbl[] __initconst = {
118118
{ HPHW_BA, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00070 },
119119
{ 0, }
120120
};
121+
MODULE_DEVICE_TABLE(parisc, asp_tbl);
121122

122-
struct parisc_driver asp_driver __refdata = {
123+
static struct parisc_driver asp_driver __refdata = {
123124
.name = "asp",
124125
.id_table = asp_tbl,
125126
.probe = asp_init_chip,
126127
};
128+
129+
static int __init asp_init(void)
130+
{
131+
return register_parisc_driver(&asp_driver);
132+
}
133+
arch_initcall(asp_init);

drivers/parisc/gsc.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,13 +260,11 @@ int gsc_common_setup(struct parisc_device *parent, struct gsc_asic *gsc_asic)
260260
}
261261

262262
extern struct parisc_driver lasi_driver;
263-
extern struct parisc_driver asp_driver;
264263

265264
static int __init gsc_init(void)
266265
{
267266
#ifdef CONFIG_GSC_LASI
268267
register_parisc_driver(&lasi_driver);
269-
register_parisc_driver(&asp_driver);
270268
#endif
271269
return 0;
272270
}

0 commit comments

Comments
 (0)