Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

parisc: wax: Initialize wax driver via arch_initcall()

Signed-off-by: Helge Deller <deller@gmx.de>

+9 -7
-4
drivers/parisc/gsc.c
··· 261 261 262 262 extern struct parisc_driver lasi_driver; 263 263 extern struct parisc_driver asp_driver; 264 - extern struct parisc_driver wax_driver; 265 264 266 265 static int __init gsc_init(void) 267 266 { 268 267 #ifdef CONFIG_GSC_LASI 269 268 register_parisc_driver(&lasi_driver); 270 269 register_parisc_driver(&asp_driver); 271 - #endif 272 - #ifdef CONFIG_GSC_WAX 273 - register_parisc_driver(&wax_driver); 274 270 #endif 275 271 return 0; 276 272 }
+9 -3
drivers/parisc/wax.c
··· 4 4 * 5 5 * (c) Copyright 2000 The Puffin Group Inc. 6 6 * 7 - * by Helge Deller <deller@gmx.de> 7 + * (c) 2000-2023 by Helge Deller <deller@gmx.de> 8 8 */ 9 9 10 10 #include <linux/errno.h> ··· 121 121 } 122 122 123 123 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 }, 125 125 { 0, } 126 126 }; 127 127 128 128 MODULE_DEVICE_TABLE(parisc, wax_tbl); 129 129 130 - struct parisc_driver wax_driver __refdata = { 130 + static struct parisc_driver wax_driver __refdata = { 131 131 .name = "wax", 132 132 .id_table = wax_tbl, 133 133 .probe = wax_init_chip, 134 134 }; 135 + 136 + static int __init wax_init(void) 137 + { 138 + return register_parisc_driver(&wax_driver); 139 + } 140 + arch_initcall(wax_init);