diff options
Diffstat (limited to 'drivers')
54 files changed, 54 insertions, 691 deletions
diff --git a/drivers/hid/hid-a4tech.c b/drivers/hid/hid-a4tech.c index 0a239885e67c..7c5507e94820 100644 --- a/drivers/hid/hid-a4tech.c +++ b/drivers/hid/hid-a4tech.c | |||
@@ -146,17 +146,6 @@ static struct hid_driver a4_driver = { | |||
146 | .probe = a4_probe, | 146 | .probe = a4_probe, |
147 | .remove = a4_remove, | 147 | .remove = a4_remove, |
148 | }; | 148 | }; |
149 | module_hid_driver(a4_driver); | ||
149 | 150 | ||
150 | static int __init a4_init(void) | ||
151 | { | ||
152 | return hid_register_driver(&a4_driver); | ||
153 | } | ||
154 | |||
155 | static void __exit a4_exit(void) | ||
156 | { | ||
157 | hid_unregister_driver(&a4_driver); | ||
158 | } | ||
159 | |||
160 | module_init(a4_init); | ||
161 | module_exit(a4_exit); | ||
162 | MODULE_LICENSE("GPL"); | 151 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index d0f7662aacca..320a958d4139 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c | |||
@@ -555,23 +555,6 @@ static struct hid_driver apple_driver = { | |||
555 | .input_mapping = apple_input_mapping, | 555 | .input_mapping = apple_input_mapping, |
556 | .input_mapped = apple_input_mapped, | 556 | .input_mapped = apple_input_mapped, |
557 | }; | 557 | }; |
558 | module_hid_driver(apple_driver); | ||
558 | 559 | ||
559 | static int __init apple_init(void) | ||
560 | { | ||
561 | int ret; | ||
562 | |||
563 | ret = hid_register_driver(&apple_driver); | ||
564 | if (ret) | ||
565 | pr_err("can't register apple driver\n"); | ||
566 | |||
567 | return ret; | ||
568 | } | ||
569 | |||
570 | static void __exit apple_exit(void) | ||
571 | { | ||
572 | hid_unregister_driver(&apple_driver); | ||
573 | } | ||
574 | |||
575 | module_init(apple_init); | ||
576 | module_exit(apple_exit); | ||
577 | MODULE_LICENSE("GPL"); | 560 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-aureal.c b/drivers/hid/hid-aureal.c index 7968187ddf7b..340ba9d394a0 100644 --- a/drivers/hid/hid-aureal.c +++ b/drivers/hid/hid-aureal.c | |||
@@ -37,17 +37,6 @@ static struct hid_driver aureal_driver = { | |||
37 | .id_table = aureal_devices, | 37 | .id_table = aureal_devices, |
38 | .report_fixup = aureal_report_fixup, | 38 | .report_fixup = aureal_report_fixup, |
39 | }; | 39 | }; |
40 | module_hid_driver(aureal_driver); | ||
40 | 41 | ||
41 | static int __init aureal_init(void) | ||
42 | { | ||
43 | return hid_register_driver(&aureal_driver); | ||
44 | } | ||
45 | |||
46 | static void __exit aureal_exit(void) | ||
47 | { | ||
48 | hid_unregister_driver(&aureal_driver); | ||
49 | } | ||
50 | |||
51 | module_init(aureal_init); | ||
52 | module_exit(aureal_exit); | ||
53 | MODULE_LICENSE("GPL"); | 42 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-axff.c b/drivers/hid/hid-axff.c index 5be858dd9a15..62f0cee032ba 100644 --- a/drivers/hid/hid-axff.c +++ b/drivers/hid/hid-axff.c | |||
@@ -192,19 +192,7 @@ static struct hid_driver ax_driver = { | |||
192 | .probe = ax_probe, | 192 | .probe = ax_probe, |
193 | .remove = ax_remove, | 193 | .remove = ax_remove, |
194 | }; | 194 | }; |
195 | 195 | module_hid_driver(ax_driver); | |
196 | static int __init ax_init(void) | ||
197 | { | ||
198 | return hid_register_driver(&ax_driver); | ||
199 | } | ||
200 | |||
201 | static void __exit ax_exit(void) | ||
202 | { | ||
203 | hid_unregister_driver(&ax_driver); | ||
204 | } | ||
205 | |||
206 | module_init(ax_init); | ||
207 | module_exit(ax_exit); | ||
208 | 196 | ||
209 | MODULE_AUTHOR("Sergei Kolzun"); | 197 | MODULE_AUTHOR("Sergei Kolzun"); |
210 | MODULE_DESCRIPTION("Force feedback support for ACRUX game controllers"); | 198 | MODULE_DESCRIPTION("Force feedback support for ACRUX game controllers"); |
diff --git a/drivers/hid/hid-belkin.c b/drivers/hid/hid-belkin.c index a1a5a12c3a6b..cc4cf138bef5 100644 --- a/drivers/hid/hid-belkin.c +++ b/drivers/hid/hid-belkin.c | |||
@@ -86,17 +86,6 @@ static struct hid_driver belkin_driver = { | |||
86 | .input_mapping = belkin_input_mapping, | 86 | .input_mapping = belkin_input_mapping, |
87 | .probe = belkin_probe, | 87 | .probe = belkin_probe, |
88 | }; | 88 | }; |
89 | module_hid_driver(belkin_driver); | ||
89 | 90 | ||
90 | static int __init belkin_init(void) | ||
91 | { | ||
92 | return hid_register_driver(&belkin_driver); | ||
93 | } | ||
94 | |||
95 | static void __exit belkin_exit(void) | ||
96 | { | ||
97 | hid_unregister_driver(&belkin_driver); | ||
98 | } | ||
99 | |||
100 | module_init(belkin_init); | ||
101 | module_exit(belkin_exit); | ||
102 | MODULE_LICENSE("GPL"); | 91 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-cherry.c b/drivers/hid/hid-cherry.c index af034d3d9256..1bdcccc54a1d 100644 --- a/drivers/hid/hid-cherry.c +++ b/drivers/hid/hid-cherry.c | |||
@@ -69,17 +69,6 @@ static struct hid_driver ch_driver = { | |||
69 | .report_fixup = ch_report_fixup, | 69 | .report_fixup = ch_report_fixup, |
70 | .input_mapping = ch_input_mapping, | 70 | .input_mapping = ch_input_mapping, |
71 | }; | 71 | }; |
72 | module_hid_driver(ch_driver); | ||
72 | 73 | ||
73 | static int __init ch_init(void) | ||
74 | { | ||
75 | return hid_register_driver(&ch_driver); | ||
76 | } | ||
77 | |||
78 | static void __exit ch_exit(void) | ||
79 | { | ||
80 | hid_unregister_driver(&ch_driver); | ||
81 | } | ||
82 | |||
83 | module_init(ch_init); | ||
84 | module_exit(ch_exit); | ||
85 | MODULE_LICENSE("GPL"); | 74 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-chicony.c b/drivers/hid/hid-chicony.c index a2abb8e15727..b613d5a79684 100644 --- a/drivers/hid/hid-chicony.c +++ b/drivers/hid/hid-chicony.c | |||
@@ -70,17 +70,6 @@ static struct hid_driver ch_driver = { | |||
70 | .id_table = ch_devices, | 70 | .id_table = ch_devices, |
71 | .input_mapping = ch_input_mapping, | 71 | .input_mapping = ch_input_mapping, |
72 | }; | 72 | }; |
73 | module_hid_driver(ch_driver); | ||
73 | 74 | ||
74 | static int __init ch_init(void) | ||
75 | { | ||
76 | return hid_register_driver(&ch_driver); | ||
77 | } | ||
78 | |||
79 | static void __exit ch_exit(void) | ||
80 | { | ||
81 | hid_unregister_driver(&ch_driver); | ||
82 | } | ||
83 | |||
84 | module_init(ch_init); | ||
85 | module_exit(ch_exit); | ||
86 | MODULE_LICENSE("GPL"); | 75 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-cypress.c b/drivers/hid/hid-cypress.c index 3e159a50dac7..c4ef3bc726e3 100644 --- a/drivers/hid/hid-cypress.c +++ b/drivers/hid/hid-cypress.c | |||
@@ -144,17 +144,6 @@ static struct hid_driver cp_driver = { | |||
144 | .event = cp_event, | 144 | .event = cp_event, |
145 | .probe = cp_probe, | 145 | .probe = cp_probe, |
146 | }; | 146 | }; |
147 | module_hid_driver(cp_driver); | ||
147 | 148 | ||
148 | static int __init cp_init(void) | ||
149 | { | ||
150 | return hid_register_driver(&cp_driver); | ||
151 | } | ||
152 | |||
153 | static void __exit cp_exit(void) | ||
154 | { | ||
155 | hid_unregister_driver(&cp_driver); | ||
156 | } | ||
157 | |||
158 | module_init(cp_init); | ||
159 | module_exit(cp_exit); | ||
160 | MODULE_LICENSE("GPL"); | 149 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-dr.c b/drivers/hid/hid-dr.c index e832f44ae383..0fe8f65ef01a 100644 --- a/drivers/hid/hid-dr.c +++ b/drivers/hid/hid-dr.c | |||
@@ -297,17 +297,6 @@ static struct hid_driver dr_driver = { | |||
297 | .report_fixup = dr_report_fixup, | 297 | .report_fixup = dr_report_fixup, |
298 | .probe = dr_probe, | 298 | .probe = dr_probe, |
299 | }; | 299 | }; |
300 | module_hid_driver(dr_driver); | ||
300 | 301 | ||
301 | static int __init dr_init(void) | ||
302 | { | ||
303 | return hid_register_driver(&dr_driver); | ||
304 | } | ||
305 | |||
306 | static void __exit dr_exit(void) | ||
307 | { | ||
308 | hid_unregister_driver(&dr_driver); | ||
309 | } | ||
310 | |||
311 | module_init(dr_init); | ||
312 | module_exit(dr_exit); | ||
313 | MODULE_LICENSE("GPL"); | 302 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-elecom.c b/drivers/hid/hid-elecom.c index 79d0c61e7214..d0bd13b62dc2 100644 --- a/drivers/hid/hid-elecom.c +++ b/drivers/hid/hid-elecom.c | |||
@@ -41,17 +41,6 @@ static struct hid_driver elecom_driver = { | |||
41 | .id_table = elecom_devices, | 41 | .id_table = elecom_devices, |
42 | .report_fixup = elecom_report_fixup | 42 | .report_fixup = elecom_report_fixup |
43 | }; | 43 | }; |
44 | module_hid_driver(elecom_driver); | ||
44 | 45 | ||
45 | static int __init elecom_init(void) | ||
46 | { | ||
47 | return hid_register_driver(&elecom_driver); | ||
48 | } | ||
49 | |||
50 | static void __exit elecom_exit(void) | ||
51 | { | ||
52 | hid_unregister_driver(&elecom_driver); | ||
53 | } | ||
54 | |||
55 | module_init(elecom_init); | ||
56 | module_exit(elecom_exit); | ||
57 | MODULE_LICENSE("GPL"); | 46 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-emsff.c b/drivers/hid/hid-emsff.c index 2630d483d262..2e093ab99b43 100644 --- a/drivers/hid/hid-emsff.c +++ b/drivers/hid/hid-emsff.c | |||
@@ -150,18 +150,7 @@ static struct hid_driver ems_driver = { | |||
150 | .id_table = ems_devices, | 150 | .id_table = ems_devices, |
151 | .probe = ems_probe, | 151 | .probe = ems_probe, |
152 | }; | 152 | }; |
153 | module_hid_driver(ems_driver); | ||
153 | 154 | ||
154 | static int ems_init(void) | ||
155 | { | ||
156 | return hid_register_driver(&ems_driver); | ||
157 | } | ||
158 | |||
159 | static void ems_exit(void) | ||
160 | { | ||
161 | hid_unregister_driver(&ems_driver); | ||
162 | } | ||
163 | |||
164 | module_init(ems_init); | ||
165 | module_exit(ems_exit); | ||
166 | MODULE_LICENSE("GPL"); | 155 | MODULE_LICENSE("GPL"); |
167 | 156 | ||
diff --git a/drivers/hid/hid-ezkey.c b/drivers/hid/hid-ezkey.c index 6540af2871a7..212ac6be2451 100644 --- a/drivers/hid/hid-ezkey.c +++ b/drivers/hid/hid-ezkey.c | |||
@@ -76,17 +76,6 @@ static struct hid_driver ez_driver = { | |||
76 | .input_mapping = ez_input_mapping, | 76 | .input_mapping = ez_input_mapping, |
77 | .event = ez_event, | 77 | .event = ez_event, |
78 | }; | 78 | }; |
79 | module_hid_driver(ez_driver); | ||
79 | 80 | ||
80 | static int __init ez_init(void) | ||
81 | { | ||
82 | return hid_register_driver(&ez_driver); | ||
83 | } | ||
84 | |||
85 | static void __exit ez_exit(void) | ||
86 | { | ||
87 | hid_unregister_driver(&ez_driver); | ||
88 | } | ||
89 | |||
90 | module_init(ez_init); | ||
91 | module_exit(ez_exit); | ||
92 | MODULE_LICENSE("GPL"); | 81 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-gaff.c b/drivers/hid/hid-gaff.c index f1e1bcf67427..04d2e6aca778 100644 --- a/drivers/hid/hid-gaff.c +++ b/drivers/hid/hid-gaff.c | |||
@@ -176,17 +176,6 @@ static struct hid_driver ga_driver = { | |||
176 | .id_table = ga_devices, | 176 | .id_table = ga_devices, |
177 | .probe = ga_probe, | 177 | .probe = ga_probe, |
178 | }; | 178 | }; |
179 | module_hid_driver(ga_driver); | ||
179 | 180 | ||
180 | static int __init ga_init(void) | ||
181 | { | ||
182 | return hid_register_driver(&ga_driver); | ||
183 | } | ||
184 | |||
185 | static void __exit ga_exit(void) | ||
186 | { | ||
187 | hid_unregister_driver(&ga_driver); | ||
188 | } | ||
189 | |||
190 | module_init(ga_init); | ||
191 | module_exit(ga_exit); | ||
192 | MODULE_LICENSE("GPL"); | 181 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-generic.c b/drivers/hid/hid-generic.c index a8b3148e03a2..e288a4a06fe8 100644 --- a/drivers/hid/hid-generic.c +++ b/drivers/hid/hid-generic.c | |||
@@ -34,19 +34,7 @@ static struct hid_driver hid_generic = { | |||
34 | .name = "hid-generic", | 34 | .name = "hid-generic", |
35 | .id_table = hid_table, | 35 | .id_table = hid_table, |
36 | }; | 36 | }; |
37 | 37 | module_hid_driver(hid_generic); | |
38 | static int __init hid_init(void) | ||
39 | { | ||
40 | return hid_register_driver(&hid_generic); | ||
41 | } | ||
42 | |||
43 | static void __exit hid_exit(void) | ||
44 | { | ||
45 | hid_unregister_driver(&hid_generic); | ||
46 | } | ||
47 | |||
48 | module_init(hid_init); | ||
49 | module_exit(hid_exit); | ||
50 | 38 | ||
51 | MODULE_AUTHOR("Henrik Rydberg"); | 39 | MODULE_AUTHOR("Henrik Rydberg"); |
52 | MODULE_DESCRIPTION("HID generic driver"); | 40 | MODULE_DESCRIPTION("HID generic driver"); |
diff --git a/drivers/hid/hid-gyration.c b/drivers/hid/hid-gyration.c index 4442c30ef531..288d61c9748e 100644 --- a/drivers/hid/hid-gyration.c +++ b/drivers/hid/hid-gyration.c | |||
@@ -88,17 +88,6 @@ static struct hid_driver gyration_driver = { | |||
88 | .input_mapping = gyration_input_mapping, | 88 | .input_mapping = gyration_input_mapping, |
89 | .event = gyration_event, | 89 | .event = gyration_event, |
90 | }; | 90 | }; |
91 | module_hid_driver(gyration_driver); | ||
91 | 92 | ||
92 | static int __init gyration_init(void) | ||
93 | { | ||
94 | return hid_register_driver(&gyration_driver); | ||
95 | } | ||
96 | |||
97 | static void __exit gyration_exit(void) | ||
98 | { | ||
99 | hid_unregister_driver(&gyration_driver); | ||
100 | } | ||
101 | |||
102 | module_init(gyration_init); | ||
103 | module_exit(gyration_exit); | ||
104 | MODULE_LICENSE("GPL"); | 93 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-holtek-kbd.c b/drivers/hid/hid-holtek-kbd.c index e0a5d1739fc3..6e1a4a4fc0c1 100644 --- a/drivers/hid/hid-holtek-kbd.c +++ b/drivers/hid/hid-holtek-kbd.c | |||
@@ -167,17 +167,6 @@ static struct hid_driver holtek_kbd_driver = { | |||
167 | .report_fixup = holtek_kbd_report_fixup, | 167 | .report_fixup = holtek_kbd_report_fixup, |
168 | .probe = holtek_kbd_probe | 168 | .probe = holtek_kbd_probe |
169 | }; | 169 | }; |
170 | module_hid_driver(holtek_kbd_driver); | ||
170 | 171 | ||
171 | static int __init holtek_kbd_init(void) | ||
172 | { | ||
173 | return hid_register_driver(&holtek_kbd_driver); | ||
174 | } | ||
175 | |||
176 | static void __exit holtek_kbd_exit(void) | ||
177 | { | ||
178 | hid_unregister_driver(&holtek_kbd_driver); | ||
179 | } | ||
180 | |||
181 | module_exit(holtek_kbd_exit); | ||
182 | module_init(holtek_kbd_init); | ||
183 | MODULE_LICENSE("GPL"); | 172 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-holtekff.c b/drivers/hid/hid-holtekff.c index ff295e60059b..f34d1186a3e1 100644 --- a/drivers/hid/hid-holtekff.c +++ b/drivers/hid/hid-holtekff.c | |||
@@ -224,17 +224,4 @@ static struct hid_driver holtek_driver = { | |||
224 | .id_table = holtek_devices, | 224 | .id_table = holtek_devices, |
225 | .probe = holtek_probe, | 225 | .probe = holtek_probe, |
226 | }; | 226 | }; |
227 | 227 | module_hid_driver(holtek_driver); | |
228 | static int __init holtek_init(void) | ||
229 | { | ||
230 | return hid_register_driver(&holtek_driver); | ||
231 | } | ||
232 | |||
233 | static void __exit holtek_exit(void) | ||
234 | { | ||
235 | hid_unregister_driver(&holtek_driver); | ||
236 | } | ||
237 | |||
238 | module_init(holtek_init); | ||
239 | module_exit(holtek_exit); | ||
240 | |||
diff --git a/drivers/hid/hid-icade.c b/drivers/hid/hid-icade.c index 1d6565e37ba3..09dcc04595f3 100644 --- a/drivers/hid/hid-icade.c +++ b/drivers/hid/hid-icade.c | |||
@@ -235,25 +235,8 @@ static struct hid_driver icade_driver = { | |||
235 | .input_mapped = icade_input_mapped, | 235 | .input_mapped = icade_input_mapped, |
236 | .input_mapping = icade_input_mapping, | 236 | .input_mapping = icade_input_mapping, |
237 | }; | 237 | }; |
238 | module_hid_driver(icade_driver); | ||
238 | 239 | ||
239 | static int __init icade_init(void) | ||
240 | { | ||
241 | int ret; | ||
242 | |||
243 | ret = hid_register_driver(&icade_driver); | ||
244 | if (ret) | ||
245 | pr_err("can't register icade driver\n"); | ||
246 | |||
247 | return ret; | ||
248 | } | ||
249 | |||
250 | static void __exit icade_exit(void) | ||
251 | { | ||
252 | hid_unregister_driver(&icade_driver); | ||
253 | } | ||
254 | |||
255 | module_init(icade_init); | ||
256 | module_exit(icade_exit); | ||
257 | MODULE_LICENSE("GPL"); | 240 | MODULE_LICENSE("GPL"); |
258 | MODULE_AUTHOR("Bastien Nocera <hadess@hadess.net>"); | 241 | MODULE_AUTHOR("Bastien Nocera <hadess@hadess.net>"); |
259 | MODULE_DESCRIPTION("ION iCade input driver"); | 242 | MODULE_DESCRIPTION("ION iCade input driver"); |
diff --git a/drivers/hid/hid-kensington.c b/drivers/hid/hid-kensington.c index a5b4016e9bd7..fe9a99dd8d08 100644 --- a/drivers/hid/hid-kensington.c +++ b/drivers/hid/hid-kensington.c | |||
@@ -47,17 +47,6 @@ static struct hid_driver ks_driver = { | |||
47 | .id_table = ks_devices, | 47 | .id_table = ks_devices, |
48 | .input_mapping = ks_input_mapping, | 48 | .input_mapping = ks_input_mapping, |
49 | }; | 49 | }; |
50 | module_hid_driver(ks_driver); | ||
50 | 51 | ||
51 | static int __init ks_init(void) | ||
52 | { | ||
53 | return hid_register_driver(&ks_driver); | ||
54 | } | ||
55 | |||
56 | static void __exit ks_exit(void) | ||
57 | { | ||
58 | hid_unregister_driver(&ks_driver); | ||
59 | } | ||
60 | |||
61 | module_init(ks_init); | ||
62 | module_exit(ks_exit); | ||
63 | MODULE_LICENSE("GPL"); | 52 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-keytouch.c b/drivers/hid/hid-keytouch.c index 07cd825f6f01..3074671b7d6a 100644 --- a/drivers/hid/hid-keytouch.c +++ b/drivers/hid/hid-keytouch.c | |||
@@ -49,18 +49,7 @@ static struct hid_driver keytouch_driver = { | |||
49 | .id_table = keytouch_devices, | 49 | .id_table = keytouch_devices, |
50 | .report_fixup = keytouch_report_fixup, | 50 | .report_fixup = keytouch_report_fixup, |
51 | }; | 51 | }; |
52 | module_hid_driver(keytouch_driver); | ||
52 | 53 | ||
53 | static int __init keytouch_init(void) | ||
54 | { | ||
55 | return hid_register_driver(&keytouch_driver); | ||
56 | } | ||
57 | |||
58 | static void __exit keytouch_exit(void) | ||
59 | { | ||
60 | hid_unregister_driver(&keytouch_driver); | ||
61 | } | ||
62 | |||
63 | module_init(keytouch_init); | ||
64 | module_exit(keytouch_exit); | ||
65 | MODULE_LICENSE("GPL"); | 54 | MODULE_LICENSE("GPL"); |
66 | MODULE_AUTHOR("Jiri Kosina"); | 55 | MODULE_AUTHOR("Jiri Kosina"); |
diff --git a/drivers/hid/hid-kye.c b/drivers/hid/hid-kye.c index b4f0d8216fd0..ef72daecfa16 100644 --- a/drivers/hid/hid-kye.c +++ b/drivers/hid/hid-kye.c | |||
@@ -419,17 +419,6 @@ static struct hid_driver kye_driver = { | |||
419 | .probe = kye_probe, | 419 | .probe = kye_probe, |
420 | .report_fixup = kye_report_fixup, | 420 | .report_fixup = kye_report_fixup, |
421 | }; | 421 | }; |
422 | module_hid_driver(kye_driver); | ||
422 | 423 | ||
423 | static int __init kye_init(void) | ||
424 | { | ||
425 | return hid_register_driver(&kye_driver); | ||
426 | } | ||
427 | |||
428 | static void __exit kye_exit(void) | ||
429 | { | ||
430 | hid_unregister_driver(&kye_driver); | ||
431 | } | ||
432 | |||
433 | module_init(kye_init); | ||
434 | module_exit(kye_exit); | ||
435 | MODULE_LICENSE("GPL"); | 424 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-lcpower.c b/drivers/hid/hid-lcpower.c index 22bc14abdfa3..6424cfdb7737 100644 --- a/drivers/hid/hid-lcpower.c +++ b/drivers/hid/hid-lcpower.c | |||
@@ -54,17 +54,6 @@ static struct hid_driver ts_driver = { | |||
54 | .id_table = ts_devices, | 54 | .id_table = ts_devices, |
55 | .input_mapping = ts_input_mapping, | 55 | .input_mapping = ts_input_mapping, |
56 | }; | 56 | }; |
57 | module_hid_driver(ts_driver); | ||
57 | 58 | ||
58 | static int __init ts_init(void) | ||
59 | { | ||
60 | return hid_register_driver(&ts_driver); | ||
61 | } | ||
62 | |||
63 | static void __exit ts_exit(void) | ||
64 | { | ||
65 | hid_unregister_driver(&ts_driver); | ||
66 | } | ||
67 | |||
68 | module_init(ts_init); | ||
69 | module_exit(ts_exit); | ||
70 | MODULE_LICENSE("GPL"); | 59 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-lenovo-tpkbd.c b/drivers/hid/hid-lenovo-tpkbd.c index cea016e94f43..956c3b135f64 100644 --- a/drivers/hid/hid-lenovo-tpkbd.c +++ b/drivers/hid/hid-lenovo-tpkbd.c | |||
@@ -468,18 +468,6 @@ static struct hid_driver tpkbd_driver = { | |||
468 | .probe = tpkbd_probe, | 468 | .probe = tpkbd_probe, |
469 | .remove = tpkbd_remove, | 469 | .remove = tpkbd_remove, |
470 | }; | 470 | }; |
471 | 471 | module_hid_driver(tpkbd_driver); | |
472 | static int __init tpkbd_init(void) | ||
473 | { | ||
474 | return hid_register_driver(&tpkbd_driver); | ||
475 | } | ||
476 | |||
477 | static void __exit tpkbd_exit(void) | ||
478 | { | ||
479 | hid_unregister_driver(&tpkbd_driver); | ||
480 | } | ||
481 | |||
482 | module_init(tpkbd_init); | ||
483 | module_exit(tpkbd_exit); | ||
484 | 472 | ||
485 | MODULE_LICENSE("GPL"); | 473 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c index a2f8e88b9fa2..e3dc73b612de 100644 --- a/drivers/hid/hid-lg.c +++ b/drivers/hid/hid-lg.c | |||
@@ -503,17 +503,6 @@ static struct hid_driver lg_driver = { | |||
503 | .probe = lg_probe, | 503 | .probe = lg_probe, |
504 | .remove = lg_remove, | 504 | .remove = lg_remove, |
505 | }; | 505 | }; |
506 | module_hid_driver(lg_driver); | ||
506 | 507 | ||
507 | static int __init lg_init(void) | ||
508 | { | ||
509 | return hid_register_driver(&lg_driver); | ||
510 | } | ||
511 | |||
512 | static void __exit lg_exit(void) | ||
513 | { | ||
514 | hid_unregister_driver(&lg_driver); | ||
515 | } | ||
516 | |||
517 | module_init(lg_init); | ||
518 | module_exit(lg_exit); | ||
519 | MODULE_LICENSE("GPL"); | 508 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 25ddf3e3aec6..f7f113ba083e 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c | |||
@@ -569,23 +569,6 @@ static struct hid_driver magicmouse_driver = { | |||
569 | .raw_event = magicmouse_raw_event, | 569 | .raw_event = magicmouse_raw_event, |
570 | .input_mapping = magicmouse_input_mapping, | 570 | .input_mapping = magicmouse_input_mapping, |
571 | }; | 571 | }; |
572 | module_hid_driver(magicmouse_driver); | ||
572 | 573 | ||
573 | static int __init magicmouse_init(void) | ||
574 | { | ||
575 | int ret; | ||
576 | |||
577 | ret = hid_register_driver(&magicmouse_driver); | ||
578 | if (ret) | ||
579 | pr_err("can't register magicmouse driver\n"); | ||
580 | |||
581 | return ret; | ||
582 | } | ||
583 | |||
584 | static void __exit magicmouse_exit(void) | ||
585 | { | ||
586 | hid_unregister_driver(&magicmouse_driver); | ||
587 | } | ||
588 | |||
589 | module_init(magicmouse_init); | ||
590 | module_exit(magicmouse_exit); | ||
591 | MODULE_LICENSE("GPL"); | 574 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c index 6fcd466d0825..29d27f65a118 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c | |||
@@ -221,17 +221,6 @@ static struct hid_driver ms_driver = { | |||
221 | .event = ms_event, | 221 | .event = ms_event, |
222 | .probe = ms_probe, | 222 | .probe = ms_probe, |
223 | }; | 223 | }; |
224 | module_hid_driver(ms_driver); | ||
224 | 225 | ||
225 | static int __init ms_init(void) | ||
226 | { | ||
227 | return hid_register_driver(&ms_driver); | ||
228 | } | ||
229 | |||
230 | static void __exit ms_exit(void) | ||
231 | { | ||
232 | hid_unregister_driver(&ms_driver); | ||
233 | } | ||
234 | |||
235 | module_init(ms_init); | ||
236 | module_exit(ms_exit); | ||
237 | MODULE_LICENSE("GPL"); | 226 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-monterey.c b/drivers/hid/hid-monterey.c index cd3643e06fa6..9e14c00eb1b6 100644 --- a/drivers/hid/hid-monterey.c +++ b/drivers/hid/hid-monterey.c | |||
@@ -63,17 +63,6 @@ static struct hid_driver mr_driver = { | |||
63 | .report_fixup = mr_report_fixup, | 63 | .report_fixup = mr_report_fixup, |
64 | .input_mapping = mr_input_mapping, | 64 | .input_mapping = mr_input_mapping, |
65 | }; | 65 | }; |
66 | module_hid_driver(mr_driver); | ||
66 | 67 | ||
67 | static int __init mr_init(void) | ||
68 | { | ||
69 | return hid_register_driver(&mr_driver); | ||
70 | } | ||
71 | |||
72 | static void __exit mr_exit(void) | ||
73 | { | ||
74 | hid_unregister_driver(&mr_driver); | ||
75 | } | ||
76 | |||
77 | module_init(mr_init); | ||
78 | module_exit(mr_exit); | ||
79 | MODULE_LICENSE("GPL"); | 68 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 61543c02ea0b..46d8136daf99 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c | |||
@@ -1198,16 +1198,4 @@ static struct hid_driver mt_driver = { | |||
1198 | .resume = mt_resume, | 1198 | .resume = mt_resume, |
1199 | #endif | 1199 | #endif |
1200 | }; | 1200 | }; |
1201 | 1201 | module_hid_driver(mt_driver); | |
1202 | static int __init mt_init(void) | ||
1203 | { | ||
1204 | return hid_register_driver(&mt_driver); | ||
1205 | } | ||
1206 | |||
1207 | static void __exit mt_exit(void) | ||
1208 | { | ||
1209 | hid_unregister_driver(&mt_driver); | ||
1210 | } | ||
1211 | |||
1212 | module_init(mt_init); | ||
1213 | module_exit(mt_exit); | ||
diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index 86a969f63292..2ffc0e3844c7 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c | |||
@@ -1026,17 +1026,6 @@ static struct hid_driver ntrig_driver = { | |||
1026 | .usage_table = ntrig_grabbed_usages, | 1026 | .usage_table = ntrig_grabbed_usages, |
1027 | .event = ntrig_event, | 1027 | .event = ntrig_event, |
1028 | }; | 1028 | }; |
1029 | module_hid_driver(ntrig_driver); | ||
1029 | 1030 | ||
1030 | static int __init ntrig_init(void) | ||
1031 | { | ||
1032 | return hid_register_driver(&ntrig_driver); | ||
1033 | } | ||
1034 | |||
1035 | static void __exit ntrig_exit(void) | ||
1036 | { | ||
1037 | hid_unregister_driver(&ntrig_driver); | ||
1038 | } | ||
1039 | |||
1040 | module_init(ntrig_init); | ||
1041 | module_exit(ntrig_exit); | ||
1042 | MODULE_LICENSE("GPL"); | 1031 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-ortek.c b/drivers/hid/hid-ortek.c index 0ffa1d2d64f0..6620f15fec22 100644 --- a/drivers/hid/hid-ortek.c +++ b/drivers/hid/hid-ortek.c | |||
@@ -50,17 +50,6 @@ static struct hid_driver ortek_driver = { | |||
50 | .id_table = ortek_devices, | 50 | .id_table = ortek_devices, |
51 | .report_fixup = ortek_report_fixup | 51 | .report_fixup = ortek_report_fixup |
52 | }; | 52 | }; |
53 | module_hid_driver(ortek_driver); | ||
53 | 54 | ||
54 | static int __init ortek_init(void) | ||
55 | { | ||
56 | return hid_register_driver(&ortek_driver); | ||
57 | } | ||
58 | |||
59 | static void __exit ortek_exit(void) | ||
60 | { | ||
61 | hid_unregister_driver(&ortek_driver); | ||
62 | } | ||
63 | |||
64 | module_init(ortek_init); | ||
65 | module_exit(ortek_exit); | ||
66 | MODULE_LICENSE("GPL"); | 55 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-petalynx.c b/drivers/hid/hid-petalynx.c index 4c521de4e7e6..736b2502df4f 100644 --- a/drivers/hid/hid-petalynx.c +++ b/drivers/hid/hid-petalynx.c | |||
@@ -103,17 +103,6 @@ static struct hid_driver pl_driver = { | |||
103 | .input_mapping = pl_input_mapping, | 103 | .input_mapping = pl_input_mapping, |
104 | .probe = pl_probe, | 104 | .probe = pl_probe, |
105 | }; | 105 | }; |
106 | module_hid_driver(pl_driver); | ||
106 | 107 | ||
107 | static int __init pl_init(void) | ||
108 | { | ||
109 | return hid_register_driver(&pl_driver); | ||
110 | } | ||
111 | |||
112 | static void __exit pl_exit(void) | ||
113 | { | ||
114 | hid_unregister_driver(&pl_driver); | ||
115 | } | ||
116 | |||
117 | module_init(pl_init); | ||
118 | module_exit(pl_exit); | ||
119 | MODULE_LICENSE("GPL"); | 108 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c index 86df26e58aba..31cd93fc3d4b 100644 --- a/drivers/hid/hid-picolcd_core.c +++ b/drivers/hid/hid-picolcd_core.c | |||
@@ -672,18 +672,7 @@ static struct hid_driver picolcd_driver = { | |||
672 | .reset_resume = picolcd_reset_resume, | 672 | .reset_resume = picolcd_reset_resume, |
673 | #endif | 673 | #endif |
674 | }; | 674 | }; |
675 | module_hid_driver(picolcd_driver); | ||
675 | 676 | ||
676 | static int __init picolcd_init(void) | ||
677 | { | ||
678 | return hid_register_driver(&picolcd_driver); | ||
679 | } | ||
680 | |||
681 | static void __exit picolcd_exit(void) | ||
682 | { | ||
683 | hid_unregister_driver(&picolcd_driver); | ||
684 | } | ||
685 | |||
686 | module_init(picolcd_init); | ||
687 | module_exit(picolcd_exit); | ||
688 | MODULE_DESCRIPTION("Minibox graphics PicoLCD Driver"); | 677 | MODULE_DESCRIPTION("Minibox graphics PicoLCD Driver"); |
689 | MODULE_LICENSE("GPL v2"); | 678 | MODULE_LICENSE("GPL v2"); |
diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c index 47ed74c46b6b..123977e5aeee 100644 --- a/drivers/hid/hid-pl.c +++ b/drivers/hid/hid-pl.c | |||
@@ -216,17 +216,6 @@ static struct hid_driver pl_driver = { | |||
216 | .id_table = pl_devices, | 216 | .id_table = pl_devices, |
217 | .probe = pl_probe, | 217 | .probe = pl_probe, |
218 | }; | 218 | }; |
219 | module_hid_driver(pl_driver); | ||
219 | 220 | ||
220 | static int __init pl_init(void) | ||
221 | { | ||
222 | return hid_register_driver(&pl_driver); | ||
223 | } | ||
224 | |||
225 | static void __exit pl_exit(void) | ||
226 | { | ||
227 | hid_unregister_driver(&pl_driver); | ||
228 | } | ||
229 | |||
230 | module_init(pl_init); | ||
231 | module_exit(pl_exit); | ||
232 | MODULE_LICENSE("GPL"); | 221 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-primax.c b/drivers/hid/hid-primax.c index c15adb0c98a1..3a1c3c4c50dc 100644 --- a/drivers/hid/hid-primax.c +++ b/drivers/hid/hid-primax.c | |||
@@ -75,18 +75,7 @@ static struct hid_driver px_driver = { | |||
75 | .id_table = px_devices, | 75 | .id_table = px_devices, |
76 | .raw_event = px_raw_event, | 76 | .raw_event = px_raw_event, |
77 | }; | 77 | }; |
78 | module_hid_driver(px_driver); | ||
78 | 79 | ||
79 | static int __init px_init(void) | ||
80 | { | ||
81 | return hid_register_driver(&px_driver); | ||
82 | } | ||
83 | |||
84 | static void __exit px_exit(void) | ||
85 | { | ||
86 | hid_unregister_driver(&px_driver); | ||
87 | } | ||
88 | |||
89 | module_init(px_init); | ||
90 | module_exit(px_exit); | ||
91 | MODULE_AUTHOR("Terry Lambert <tlambert@google.com>"); | 80 | MODULE_AUTHOR("Terry Lambert <tlambert@google.com>"); |
92 | MODULE_LICENSE("GPL"); | 81 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c index ec8ca3336315..4e1c4bcbdc03 100644 --- a/drivers/hid/hid-prodikeys.c +++ b/drivers/hid/hid-prodikeys.c | |||
@@ -889,23 +889,6 @@ static struct hid_driver pk_driver = { | |||
889 | .probe = pk_probe, | 889 | .probe = pk_probe, |
890 | .remove = pk_remove, | 890 | .remove = pk_remove, |
891 | }; | 891 | }; |
892 | module_hid_driver(pk_driver); | ||
892 | 893 | ||
893 | static int pk_init(void) | ||
894 | { | ||
895 | int ret; | ||
896 | |||
897 | ret = hid_register_driver(&pk_driver); | ||
898 | if (ret) | ||
899 | pr_err("can't register prodikeys driver\n"); | ||
900 | |||
901 | return ret; | ||
902 | } | ||
903 | |||
904 | static void pk_exit(void) | ||
905 | { | ||
906 | hid_unregister_driver(&pk_driver); | ||
907 | } | ||
908 | |||
909 | module_init(pk_init); | ||
910 | module_exit(pk_exit); | ||
911 | MODULE_LICENSE("GPL"); | 894 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-ps3remote.c b/drivers/hid/hid-ps3remote.c index 03811e539d71..f1239d3c5b14 100644 --- a/drivers/hid/hid-ps3remote.c +++ b/drivers/hid/hid-ps3remote.c | |||
@@ -198,18 +198,7 @@ static struct hid_driver ps3remote_driver = { | |||
198 | .report_fixup = ps3remote_fixup, | 198 | .report_fixup = ps3remote_fixup, |
199 | .input_mapping = ps3remote_mapping, | 199 | .input_mapping = ps3remote_mapping, |
200 | }; | 200 | }; |
201 | module_hid_driver(ps3remote_driver); | ||
201 | 202 | ||
202 | static int __init ps3remote_init(void) | ||
203 | { | ||
204 | return hid_register_driver(&ps3remote_driver); | ||
205 | } | ||
206 | |||
207 | static void __exit ps3remote_exit(void) | ||
208 | { | ||
209 | hid_unregister_driver(&ps3remote_driver); | ||
210 | } | ||
211 | |||
212 | module_init(ps3remote_init); | ||
213 | module_exit(ps3remote_exit); | ||
214 | MODULE_LICENSE("GPL"); | 203 | MODULE_LICENSE("GPL"); |
215 | MODULE_AUTHOR("David Dillow <dave@thedillows.org>, Antonio Ospite <ospite@studenti.unina.it>"); | 204 | MODULE_AUTHOR("David Dillow <dave@thedillows.org>, Antonio Ospite <ospite@studenti.unina.it>"); |
diff --git a/drivers/hid/hid-roccat-lua.c b/drivers/hid/hid-roccat-lua.c index 5084fb4b7e91..6adc0fa08d96 100644 --- a/drivers/hid/hid-roccat-lua.c +++ b/drivers/hid/hid-roccat-lua.c | |||
@@ -208,19 +208,7 @@ static struct hid_driver lua_driver = { | |||
208 | .probe = lua_probe, | 208 | .probe = lua_probe, |
209 | .remove = lua_remove | 209 | .remove = lua_remove |
210 | }; | 210 | }; |
211 | 211 | module_hid_driver(lua_driver); | |
212 | static int __init lua_init(void) | ||
213 | { | ||
214 | return hid_register_driver(&lua_driver); | ||
215 | } | ||
216 | |||
217 | static void __exit lua_exit(void) | ||
218 | { | ||
219 | hid_unregister_driver(&lua_driver); | ||
220 | } | ||
221 | |||
222 | module_init(lua_init); | ||
223 | module_exit(lua_exit); | ||
224 | 212 | ||
225 | MODULE_AUTHOR("Stefan Achatz"); | 213 | MODULE_AUTHOR("Stefan Achatz"); |
226 | MODULE_DESCRIPTION("USB Roccat Lua driver"); | 214 | MODULE_DESCRIPTION("USB Roccat Lua driver"); |
diff --git a/drivers/hid/hid-saitek.c b/drivers/hid/hid-saitek.c index 45aea77bb611..37961c7e397d 100644 --- a/drivers/hid/hid-saitek.c +++ b/drivers/hid/hid-saitek.c | |||
@@ -54,17 +54,6 @@ static struct hid_driver saitek_driver = { | |||
54 | .id_table = saitek_devices, | 54 | .id_table = saitek_devices, |
55 | .report_fixup = saitek_report_fixup | 55 | .report_fixup = saitek_report_fixup |
56 | }; | 56 | }; |
57 | module_hid_driver(saitek_driver); | ||
57 | 58 | ||
58 | static int __init saitek_init(void) | ||
59 | { | ||
60 | return hid_register_driver(&saitek_driver); | ||
61 | } | ||
62 | |||
63 | static void __exit saitek_exit(void) | ||
64 | { | ||
65 | hid_unregister_driver(&saitek_driver); | ||
66 | } | ||
67 | |||
68 | module_init(saitek_init); | ||
69 | module_exit(saitek_exit); | ||
70 | MODULE_LICENSE("GPL"); | 59 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-samsung.c b/drivers/hid/hid-samsung.c index a5821d317229..7cbb067d4a9e 100644 --- a/drivers/hid/hid-samsung.c +++ b/drivers/hid/hid-samsung.c | |||
@@ -196,17 +196,6 @@ static struct hid_driver samsung_driver = { | |||
196 | .input_mapping = samsung_input_mapping, | 196 | .input_mapping = samsung_input_mapping, |
197 | .probe = samsung_probe, | 197 | .probe = samsung_probe, |
198 | }; | 198 | }; |
199 | module_hid_driver(samsung_driver); | ||
199 | 200 | ||
200 | static int __init samsung_init(void) | ||
201 | { | ||
202 | return hid_register_driver(&samsung_driver); | ||
203 | } | ||
204 | |||
205 | static void __exit samsung_exit(void) | ||
206 | { | ||
207 | hid_unregister_driver(&samsung_driver); | ||
208 | } | ||
209 | |||
210 | module_init(samsung_init); | ||
211 | module_exit(samsung_exit); | ||
212 | MODULE_LICENSE("GPL"); | 201 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c index 0bc58bd8d4f5..4179f5e91e68 100644 --- a/drivers/hid/hid-sensor-hub.c +++ b/drivers/hid/hid-sensor-hub.c | |||
@@ -627,19 +627,7 @@ static struct hid_driver sensor_hub_driver = { | |||
627 | .reset_resume = sensor_hub_reset_resume, | 627 | .reset_resume = sensor_hub_reset_resume, |
628 | #endif | 628 | #endif |
629 | }; | 629 | }; |
630 | 630 | module_hid_driver(sensor_hub_driver); | |
631 | static int __init sensor_hub_init(void) | ||
632 | { | ||
633 | return hid_register_driver(&sensor_hub_driver); | ||
634 | } | ||
635 | |||
636 | static void __exit sensor_hub_exit(void) | ||
637 | { | ||
638 | hid_unregister_driver(&sensor_hub_driver); | ||
639 | } | ||
640 | |||
641 | module_init(sensor_hub_init); | ||
642 | module_exit(sensor_hub_exit); | ||
643 | 631 | ||
644 | MODULE_DESCRIPTION("HID Sensor Hub driver"); | 632 | MODULE_DESCRIPTION("HID Sensor Hub driver"); |
645 | MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@intel.com>"); | 633 | MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@intel.com>"); |
diff --git a/drivers/hid/hid-sjoy.c b/drivers/hid/hid-sjoy.c index 42257acfeb73..28f774003f03 100644 --- a/drivers/hid/hid-sjoy.c +++ b/drivers/hid/hid-sjoy.c | |||
@@ -177,19 +177,8 @@ static struct hid_driver sjoy_driver = { | |||
177 | .id_table = sjoy_devices, | 177 | .id_table = sjoy_devices, |
178 | .probe = sjoy_probe, | 178 | .probe = sjoy_probe, |
179 | }; | 179 | }; |
180 | module_hid_driver(sjoy_driver); | ||
180 | 181 | ||
181 | static int __init sjoy_init(void) | ||
182 | { | ||
183 | return hid_register_driver(&sjoy_driver); | ||
184 | } | ||
185 | |||
186 | static void __exit sjoy_exit(void) | ||
187 | { | ||
188 | hid_unregister_driver(&sjoy_driver); | ||
189 | } | ||
190 | |||
191 | module_init(sjoy_init); | ||
192 | module_exit(sjoy_exit); | ||
193 | MODULE_LICENSE("GPL"); | 182 | MODULE_LICENSE("GPL"); |
194 | MODULE_AUTHOR("Jussi Kivilinna"); | 183 | MODULE_AUTHOR("Jussi Kivilinna"); |
195 | 184 | ||
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 7f33ebf299c2..23fc762e8633 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c | |||
@@ -229,17 +229,6 @@ static struct hid_driver sony_driver = { | |||
229 | .report_fixup = sony_report_fixup, | 229 | .report_fixup = sony_report_fixup, |
230 | .raw_event = sony_raw_event | 230 | .raw_event = sony_raw_event |
231 | }; | 231 | }; |
232 | module_hid_driver(sony_driver); | ||
232 | 233 | ||
233 | static int __init sony_init(void) | ||
234 | { | ||
235 | return hid_register_driver(&sony_driver); | ||
236 | } | ||
237 | |||
238 | static void __exit sony_exit(void) | ||
239 | { | ||
240 | hid_unregister_driver(&sony_driver); | ||
241 | } | ||
242 | |||
243 | module_init(sony_init); | ||
244 | module_exit(sony_exit); | ||
245 | MODULE_LICENSE("GPL"); | 234 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-speedlink.c b/drivers/hid/hid-speedlink.c index 602013741718..e94371a059cb 100644 --- a/drivers/hid/hid-speedlink.c +++ b/drivers/hid/hid-speedlink.c | |||
@@ -73,17 +73,6 @@ static struct hid_driver speedlink_driver = { | |||
73 | .input_mapping = speedlink_input_mapping, | 73 | .input_mapping = speedlink_input_mapping, |
74 | .event = speedlink_event, | 74 | .event = speedlink_event, |
75 | }; | 75 | }; |
76 | module_hid_driver(speedlink_driver); | ||
76 | 77 | ||
77 | static int __init speedlink_init(void) | ||
78 | { | ||
79 | return hid_register_driver(&speedlink_driver); | ||
80 | } | ||
81 | |||
82 | static void __exit speedlink_exit(void) | ||
83 | { | ||
84 | hid_unregister_driver(&speedlink_driver); | ||
85 | } | ||
86 | |||
87 | module_init(speedlink_init); | ||
88 | module_exit(speedlink_exit); | ||
89 | MODULE_LICENSE("GPL"); | 78 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-sunplus.c b/drivers/hid/hid-sunplus.c index 45b4b066a262..87fc91e1c8de 100644 --- a/drivers/hid/hid-sunplus.c +++ b/drivers/hid/hid-sunplus.c | |||
@@ -63,17 +63,6 @@ static struct hid_driver sp_driver = { | |||
63 | .report_fixup = sp_report_fixup, | 63 | .report_fixup = sp_report_fixup, |
64 | .input_mapping = sp_input_mapping, | 64 | .input_mapping = sp_input_mapping, |
65 | }; | 65 | }; |
66 | module_hid_driver(sp_driver); | ||
66 | 67 | ||
67 | static int __init sp_init(void) | ||
68 | { | ||
69 | return hid_register_driver(&sp_driver); | ||
70 | } | ||
71 | |||
72 | static void __exit sp_exit(void) | ||
73 | { | ||
74 | hid_unregister_driver(&sp_driver); | ||
75 | } | ||
76 | |||
77 | module_init(sp_init); | ||
78 | module_exit(sp_exit); | ||
79 | MODULE_LICENSE("GPL"); | 68 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-tivo.c b/drivers/hid/hid-tivo.c index 9f85f827607f..d790d8d71f7f 100644 --- a/drivers/hid/hid-tivo.c +++ b/drivers/hid/hid-tivo.c | |||
@@ -73,18 +73,7 @@ static struct hid_driver tivo_driver = { | |||
73 | .id_table = tivo_devices, | 73 | .id_table = tivo_devices, |
74 | .input_mapping = tivo_input_mapping, | 74 | .input_mapping = tivo_input_mapping, |
75 | }; | 75 | }; |
76 | module_hid_driver(tivo_driver); | ||
76 | 77 | ||
77 | static int __init tivo_init(void) | ||
78 | { | ||
79 | return hid_register_driver(&tivo_driver); | ||
80 | } | ||
81 | |||
82 | static void __exit tivo_exit(void) | ||
83 | { | ||
84 | hid_unregister_driver(&tivo_driver); | ||
85 | } | ||
86 | |||
87 | module_init(tivo_init); | ||
88 | module_exit(tivo_exit); | ||
89 | MODULE_LICENSE("GPL"); | 78 | MODULE_LICENSE("GPL"); |
90 | MODULE_AUTHOR("Jarod Wilson <jarod@redhat.com>"); | 79 | MODULE_AUTHOR("Jarod Wilson <jarod@redhat.com>"); |
diff --git a/drivers/hid/hid-tmff.c b/drivers/hid/hid-tmff.c index 83a933b9c2e9..e4fcf3f702a5 100644 --- a/drivers/hid/hid-tmff.c +++ b/drivers/hid/hid-tmff.c | |||
@@ -261,17 +261,6 @@ static struct hid_driver tm_driver = { | |||
261 | .id_table = tm_devices, | 261 | .id_table = tm_devices, |
262 | .probe = tm_probe, | 262 | .probe = tm_probe, |
263 | }; | 263 | }; |
264 | module_hid_driver(tm_driver); | ||
264 | 265 | ||
265 | static int __init tm_init(void) | ||
266 | { | ||
267 | return hid_register_driver(&tm_driver); | ||
268 | } | ||
269 | |||
270 | static void __exit tm_exit(void) | ||
271 | { | ||
272 | hid_unregister_driver(&tm_driver); | ||
273 | } | ||
274 | |||
275 | module_init(tm_init); | ||
276 | module_exit(tm_exit); | ||
277 | MODULE_LICENSE("GPL"); | 266 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-topseed.c b/drivers/hid/hid-topseed.c index 613ff7b1d746..8a5b843e9dd6 100644 --- a/drivers/hid/hid-topseed.c +++ b/drivers/hid/hid-topseed.c | |||
@@ -76,17 +76,6 @@ static struct hid_driver ts_driver = { | |||
76 | .id_table = ts_devices, | 76 | .id_table = ts_devices, |
77 | .input_mapping = ts_input_mapping, | 77 | .input_mapping = ts_input_mapping, |
78 | }; | 78 | }; |
79 | module_hid_driver(ts_driver); | ||
79 | 80 | ||
80 | static int __init ts_init(void) | ||
81 | { | ||
82 | return hid_register_driver(&ts_driver); | ||
83 | } | ||
84 | |||
85 | static void __exit ts_exit(void) | ||
86 | { | ||
87 | hid_unregister_driver(&ts_driver); | ||
88 | } | ||
89 | |||
90 | module_init(ts_init); | ||
91 | module_exit(ts_exit); | ||
92 | MODULE_LICENSE("GPL"); | 81 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-twinhan.c b/drivers/hid/hid-twinhan.c index f23456b1fd4b..c08c36443f83 100644 --- a/drivers/hid/hid-twinhan.c +++ b/drivers/hid/hid-twinhan.c | |||
@@ -131,17 +131,6 @@ static struct hid_driver twinhan_driver = { | |||
131 | .id_table = twinhan_devices, | 131 | .id_table = twinhan_devices, |
132 | .input_mapping = twinhan_input_mapping, | 132 | .input_mapping = twinhan_input_mapping, |
133 | }; | 133 | }; |
134 | module_hid_driver(twinhan_driver); | ||
134 | 135 | ||
135 | static int __init twinhan_init(void) | ||
136 | { | ||
137 | return hid_register_driver(&twinhan_driver); | ||
138 | } | ||
139 | |||
140 | static void __exit twinhan_exit(void) | ||
141 | { | ||
142 | hid_unregister_driver(&twinhan_driver); | ||
143 | } | ||
144 | |||
145 | module_init(twinhan_init); | ||
146 | module_exit(twinhan_exit); | ||
147 | MODULE_LICENSE("GPL"); | 136 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-uclogic.c b/drivers/hid/hid-uclogic.c index 2e56a1fd2375..fb8b516ff0ed 100644 --- a/drivers/hid/hid-uclogic.c +++ b/drivers/hid/hid-uclogic.c | |||
@@ -650,17 +650,6 @@ static struct hid_driver uclogic_driver = { | |||
650 | .id_table = uclogic_devices, | 650 | .id_table = uclogic_devices, |
651 | .report_fixup = uclogic_report_fixup, | 651 | .report_fixup = uclogic_report_fixup, |
652 | }; | 652 | }; |
653 | module_hid_driver(uclogic_driver); | ||
653 | 654 | ||
654 | static int __init uclogic_init(void) | ||
655 | { | ||
656 | return hid_register_driver(&uclogic_driver); | ||
657 | } | ||
658 | |||
659 | static void __exit uclogic_exit(void) | ||
660 | { | ||
661 | hid_unregister_driver(&uclogic_driver); | ||
662 | } | ||
663 | |||
664 | module_init(uclogic_init); | ||
665 | module_exit(uclogic_exit); | ||
666 | MODULE_LICENSE("GPL"); | 655 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c index 2f60da9ed066..a4a8bb0da688 100644 --- a/drivers/hid/hid-wacom.c +++ b/drivers/hid/hid-wacom.c | |||
@@ -953,23 +953,7 @@ static struct hid_driver wacom_driver = { | |||
953 | .raw_event = wacom_raw_event, | 953 | .raw_event = wacom_raw_event, |
954 | .input_mapped = wacom_input_mapped, | 954 | .input_mapped = wacom_input_mapped, |
955 | }; | 955 | }; |
956 | module_hid_driver(wacom_driver); | ||
956 | 957 | ||
957 | static int __init wacom_init(void) | ||
958 | { | ||
959 | int ret; | ||
960 | |||
961 | ret = hid_register_driver(&wacom_driver); | ||
962 | if (ret) | ||
963 | pr_err("can't register wacom driver\n"); | ||
964 | return ret; | ||
965 | } | ||
966 | |||
967 | static void __exit wacom_exit(void) | ||
968 | { | ||
969 | hid_unregister_driver(&wacom_driver); | ||
970 | } | ||
971 | |||
972 | module_init(wacom_init); | ||
973 | module_exit(wacom_exit); | ||
974 | MODULE_DESCRIPTION("Driver for Wacom Graphire Bluetooth and Wacom Intuos4 WL"); | 958 | MODULE_DESCRIPTION("Driver for Wacom Graphire Bluetooth and Wacom Intuos4 WL"); |
975 | MODULE_LICENSE("GPL"); | 959 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-waltop.c b/drivers/hid/hid-waltop.c index bb536ab5941e..059931d7b392 100644 --- a/drivers/hid/hid-waltop.c +++ b/drivers/hid/hid-waltop.c | |||
@@ -779,17 +779,6 @@ static struct hid_driver waltop_driver = { | |||
779 | .report_fixup = waltop_report_fixup, | 779 | .report_fixup = waltop_report_fixup, |
780 | .raw_event = waltop_raw_event, | 780 | .raw_event = waltop_raw_event, |
781 | }; | 781 | }; |
782 | module_hid_driver(waltop_driver); | ||
782 | 783 | ||
783 | static int __init waltop_init(void) | ||
784 | { | ||
785 | return hid_register_driver(&waltop_driver); | ||
786 | } | ||
787 | |||
788 | static void __exit waltop_exit(void) | ||
789 | { | ||
790 | hid_unregister_driver(&waltop_driver); | ||
791 | } | ||
792 | |||
793 | module_init(waltop_init); | ||
794 | module_exit(waltop_exit); | ||
795 | MODULE_LICENSE("GPL"); | 784 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c index 84e2fbec5fbb..0fb8ab93db68 100644 --- a/drivers/hid/hid-wiimote-core.c +++ b/drivers/hid/hid-wiimote-core.c | |||
@@ -1294,25 +1294,8 @@ static struct hid_driver wiimote_hid_driver = { | |||
1294 | .remove = wiimote_hid_remove, | 1294 | .remove = wiimote_hid_remove, |
1295 | .raw_event = wiimote_hid_event, | 1295 | .raw_event = wiimote_hid_event, |
1296 | }; | 1296 | }; |
1297 | module_hid_driver(wiimote_hid_driver); | ||
1297 | 1298 | ||
1298 | static int __init wiimote_init(void) | ||
1299 | { | ||
1300 | int ret; | ||
1301 | |||
1302 | ret = hid_register_driver(&wiimote_hid_driver); | ||
1303 | if (ret) | ||
1304 | pr_err("Can't register wiimote hid driver\n"); | ||
1305 | |||
1306 | return ret; | ||
1307 | } | ||
1308 | |||
1309 | static void __exit wiimote_exit(void) | ||
1310 | { | ||
1311 | hid_unregister_driver(&wiimote_hid_driver); | ||
1312 | } | ||
1313 | |||
1314 | module_init(wiimote_init); | ||
1315 | module_exit(wiimote_exit); | ||
1316 | MODULE_LICENSE("GPL"); | 1299 | MODULE_LICENSE("GPL"); |
1317 | MODULE_AUTHOR("David Herrmann <dh.herrmann@gmail.com>"); | 1300 | MODULE_AUTHOR("David Herrmann <dh.herrmann@gmail.com>"); |
1318 | MODULE_DESCRIPTION(WIIMOTE_NAME " Device Driver"); | 1301 | MODULE_DESCRIPTION(WIIMOTE_NAME " Device Driver"); |
diff --git a/drivers/hid/hid-zpff.c b/drivers/hid/hid-zpff.c index f6ba81df71bd..af66452592e9 100644 --- a/drivers/hid/hid-zpff.c +++ b/drivers/hid/hid-zpff.c | |||
@@ -152,17 +152,6 @@ static struct hid_driver zp_driver = { | |||
152 | .id_table = zp_devices, | 152 | .id_table = zp_devices, |
153 | .probe = zp_probe, | 153 | .probe = zp_probe, |
154 | }; | 154 | }; |
155 | module_hid_driver(zp_driver); | ||
155 | 156 | ||
156 | static int __init zp_init(void) | ||
157 | { | ||
158 | return hid_register_driver(&zp_driver); | ||
159 | } | ||
160 | |||
161 | static void __exit zp_exit(void) | ||
162 | { | ||
163 | hid_unregister_driver(&zp_driver); | ||
164 | } | ||
165 | |||
166 | module_init(zp_init); | ||
167 | module_exit(zp_exit); | ||
168 | MODULE_LICENSE("GPL"); | 157 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hid/hid-zydacron.c b/drivers/hid/hid-zydacron.c index 1ad85f2257b4..e4cddeccd6b5 100644 --- a/drivers/hid/hid-zydacron.c +++ b/drivers/hid/hid-zydacron.c | |||
@@ -219,17 +219,6 @@ static struct hid_driver zc_driver = { | |||
219 | .probe = zc_probe, | 219 | .probe = zc_probe, |
220 | .remove = zc_remove, | 220 | .remove = zc_remove, |
221 | }; | 221 | }; |
222 | module_hid_driver(zc_driver); | ||
222 | 223 | ||
223 | static int __init zc_init(void) | ||
224 | { | ||
225 | return hid_register_driver(&zc_driver); | ||
226 | } | ||
227 | |||
228 | static void __exit zc_exit(void) | ||
229 | { | ||
230 | hid_unregister_driver(&zc_driver); | ||
231 | } | ||
232 | |||
233 | module_init(zc_init); | ||
234 | module_exit(zc_exit); | ||
235 | MODULE_LICENSE("GPL"); | 224 | MODULE_LICENSE("GPL"); |