diff options
Diffstat (limited to 'drivers/input')
31 files changed, 31 insertions, 452 deletions
diff --git a/drivers/input/joystick/magellan.c b/drivers/input/joystick/magellan.c index 40e40780747d..9fb153eef2fc 100644 --- a/drivers/input/joystick/magellan.c +++ b/drivers/input/joystick/magellan.c | |||
@@ -222,19 +222,4 @@ static struct serio_driver magellan_drv = { | |||
222 | .disconnect = magellan_disconnect, | 222 | .disconnect = magellan_disconnect, |
223 | }; | 223 | }; |
224 | 224 | ||
225 | /* | 225 | module_serio_driver(magellan_drv); |
226 | * The functions for inserting/removing us as a module. | ||
227 | */ | ||
228 | |||
229 | static int __init magellan_init(void) | ||
230 | { | ||
231 | return serio_register_driver(&magellan_drv); | ||
232 | } | ||
233 | |||
234 | static void __exit magellan_exit(void) | ||
235 | { | ||
236 | serio_unregister_driver(&magellan_drv); | ||
237 | } | ||
238 | |||
239 | module_init(magellan_init); | ||
240 | module_exit(magellan_exit); | ||
diff --git a/drivers/input/joystick/spaceball.c b/drivers/input/joystick/spaceball.c index 0cd9b29356a8..80a7b27a457a 100644 --- a/drivers/input/joystick/spaceball.c +++ b/drivers/input/joystick/spaceball.c | |||
@@ -296,19 +296,4 @@ static struct serio_driver spaceball_drv = { | |||
296 | .disconnect = spaceball_disconnect, | 296 | .disconnect = spaceball_disconnect, |
297 | }; | 297 | }; |
298 | 298 | ||
299 | /* | 299 | module_serio_driver(spaceball_drv); |
300 | * The functions for inserting/removing us as a module. | ||
301 | */ | ||
302 | |||
303 | static int __init spaceball_init(void) | ||
304 | { | ||
305 | return serio_register_driver(&spaceball_drv); | ||
306 | } | ||
307 | |||
308 | static void __exit spaceball_exit(void) | ||
309 | { | ||
310 | serio_unregister_driver(&spaceball_drv); | ||
311 | } | ||
312 | |||
313 | module_init(spaceball_init); | ||
314 | module_exit(spaceball_exit); | ||
diff --git a/drivers/input/joystick/spaceorb.c b/drivers/input/joystick/spaceorb.c index a694bf8e557b..a41f291652e6 100644 --- a/drivers/input/joystick/spaceorb.c +++ b/drivers/input/joystick/spaceorb.c | |||
@@ -237,19 +237,4 @@ static struct serio_driver spaceorb_drv = { | |||
237 | .disconnect = spaceorb_disconnect, | 237 | .disconnect = spaceorb_disconnect, |
238 | }; | 238 | }; |
239 | 239 | ||
240 | /* | 240 | module_serio_driver(spaceorb_drv); |
241 | * The functions for inserting/removing us as a module. | ||
242 | */ | ||
243 | |||
244 | static int __init spaceorb_init(void) | ||
245 | { | ||
246 | return serio_register_driver(&spaceorb_drv); | ||
247 | } | ||
248 | |||
249 | static void __exit spaceorb_exit(void) | ||
250 | { | ||
251 | serio_unregister_driver(&spaceorb_drv); | ||
252 | } | ||
253 | |||
254 | module_init(spaceorb_init); | ||
255 | module_exit(spaceorb_exit); | ||
diff --git a/drivers/input/joystick/stinger.c b/drivers/input/joystick/stinger.c index e0db9f5e4b41..0f51a60e14a7 100644 --- a/drivers/input/joystick/stinger.c +++ b/drivers/input/joystick/stinger.c | |||
@@ -208,19 +208,4 @@ static struct serio_driver stinger_drv = { | |||
208 | .disconnect = stinger_disconnect, | 208 | .disconnect = stinger_disconnect, |
209 | }; | 209 | }; |
210 | 210 | ||
211 | /* | 211 | module_serio_driver(stinger_drv); |
212 | * The functions for inserting/removing us as a module. | ||
213 | */ | ||
214 | |||
215 | static int __init stinger_init(void) | ||
216 | { | ||
217 | return serio_register_driver(&stinger_drv); | ||
218 | } | ||
219 | |||
220 | static void __exit stinger_exit(void) | ||
221 | { | ||
222 | serio_unregister_driver(&stinger_drv); | ||
223 | } | ||
224 | |||
225 | module_init(stinger_init); | ||
226 | module_exit(stinger_exit); | ||
diff --git a/drivers/input/joystick/twidjoy.c b/drivers/input/joystick/twidjoy.c index 3f4ec73c9553..2556a8193579 100644 --- a/drivers/input/joystick/twidjoy.c +++ b/drivers/input/joystick/twidjoy.c | |||
@@ -257,19 +257,4 @@ static struct serio_driver twidjoy_drv = { | |||
257 | .disconnect = twidjoy_disconnect, | 257 | .disconnect = twidjoy_disconnect, |
258 | }; | 258 | }; |
259 | 259 | ||
260 | /* | 260 | module_serio_driver(twidjoy_drv); |
261 | * The functions for inserting/removing us as a module. | ||
262 | */ | ||
263 | |||
264 | static int __init twidjoy_init(void) | ||
265 | { | ||
266 | return serio_register_driver(&twidjoy_drv); | ||
267 | } | ||
268 | |||
269 | static void __exit twidjoy_exit(void) | ||
270 | { | ||
271 | serio_unregister_driver(&twidjoy_drv); | ||
272 | } | ||
273 | |||
274 | module_init(twidjoy_init); | ||
275 | module_exit(twidjoy_exit); | ||
diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c index f72c83e15e60..23b3071abb6e 100644 --- a/drivers/input/joystick/warrior.c +++ b/drivers/input/joystick/warrior.c | |||
@@ -217,19 +217,4 @@ static struct serio_driver warrior_drv = { | |||
217 | .disconnect = warrior_disconnect, | 217 | .disconnect = warrior_disconnect, |
218 | }; | 218 | }; |
219 | 219 | ||
220 | /* | 220 | module_serio_driver(warrior_drv); |
221 | * The functions for inserting/removing us as a module. | ||
222 | */ | ||
223 | |||
224 | static int __init warrior_init(void) | ||
225 | { | ||
226 | return serio_register_driver(&warrior_drv); | ||
227 | } | ||
228 | |||
229 | static void __exit warrior_exit(void) | ||
230 | { | ||
231 | serio_unregister_driver(&warrior_drv); | ||
232 | } | ||
233 | |||
234 | module_init(warrior_init); | ||
235 | module_exit(warrior_exit); | ||
diff --git a/drivers/input/joystick/zhenhua.c b/drivers/input/joystick/zhenhua.c index b5853125c898..c4de4388fd7f 100644 --- a/drivers/input/joystick/zhenhua.c +++ b/drivers/input/joystick/zhenhua.c | |||
@@ -225,19 +225,4 @@ static struct serio_driver zhenhua_drv = { | |||
225 | .disconnect = zhenhua_disconnect, | 225 | .disconnect = zhenhua_disconnect, |
226 | }; | 226 | }; |
227 | 227 | ||
228 | /* | 228 | module_serio_driver(zhenhua_drv); |
229 | * The functions for inserting/removing us as a module. | ||
230 | */ | ||
231 | |||
232 | static int __init zhenhua_init(void) | ||
233 | { | ||
234 | return serio_register_driver(&zhenhua_drv); | ||
235 | } | ||
236 | |||
237 | static void __exit zhenhua_exit(void) | ||
238 | { | ||
239 | serio_unregister_driver(&zhenhua_drv); | ||
240 | } | ||
241 | |||
242 | module_init(zhenhua_init); | ||
243 | module_exit(zhenhua_exit); | ||
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c index fed31e0947a1..589e3c258f3f 100644 --- a/drivers/input/keyboard/hil_kbd.c +++ b/drivers/input/keyboard/hil_kbd.c | |||
@@ -583,15 +583,4 @@ static struct serio_driver hil_serio_drv = { | |||
583 | .interrupt = hil_dev_interrupt | 583 | .interrupt = hil_dev_interrupt |
584 | }; | 584 | }; |
585 | 585 | ||
586 | static int __init hil_dev_init(void) | 586 | module_serio_driver(hil_serio_drv); |
587 | { | ||
588 | return serio_register_driver(&hil_serio_drv); | ||
589 | } | ||
590 | |||
591 | static void __exit hil_dev_exit(void) | ||
592 | { | ||
593 | serio_unregister_driver(&hil_serio_drv); | ||
594 | } | ||
595 | |||
596 | module_init(hil_dev_init); | ||
597 | module_exit(hil_dev_exit); | ||
diff --git a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c index fa9bb6d235e2..fc0a63c2f278 100644 --- a/drivers/input/keyboard/lkkbd.c +++ b/drivers/input/keyboard/lkkbd.c | |||
@@ -731,19 +731,4 @@ static struct serio_driver lkkbd_drv = { | |||
731 | .interrupt = lkkbd_interrupt, | 731 | .interrupt = lkkbd_interrupt, |
732 | }; | 732 | }; |
733 | 733 | ||
734 | /* | 734 | module_serio_driver(lkkbd_drv); |
735 | * The functions for insering/removing us as a module. | ||
736 | */ | ||
737 | static int __init lkkbd_init(void) | ||
738 | { | ||
739 | return serio_register_driver(&lkkbd_drv); | ||
740 | } | ||
741 | |||
742 | static void __exit lkkbd_exit(void) | ||
743 | { | ||
744 | serio_unregister_driver(&lkkbd_drv); | ||
745 | } | ||
746 | |||
747 | module_init(lkkbd_init); | ||
748 | module_exit(lkkbd_exit); | ||
749 | |||
diff --git a/drivers/input/keyboard/newtonkbd.c b/drivers/input/keyboard/newtonkbd.c index 48d1cab0aa1c..f971898ad591 100644 --- a/drivers/input/keyboard/newtonkbd.c +++ b/drivers/input/keyboard/newtonkbd.c | |||
@@ -166,15 +166,4 @@ static struct serio_driver nkbd_drv = { | |||
166 | .disconnect = nkbd_disconnect, | 166 | .disconnect = nkbd_disconnect, |
167 | }; | 167 | }; |
168 | 168 | ||
169 | static int __init nkbd_init(void) | 169 | module_serio_driver(nkbd_drv); |
170 | { | ||
171 | return serio_register_driver(&nkbd_drv); | ||
172 | } | ||
173 | |||
174 | static void __exit nkbd_exit(void) | ||
175 | { | ||
176 | serio_unregister_driver(&nkbd_drv); | ||
177 | } | ||
178 | |||
179 | module_init(nkbd_init); | ||
180 | module_exit(nkbd_exit); | ||
diff --git a/drivers/input/keyboard/stowaway.c b/drivers/input/keyboard/stowaway.c index 7437219370b1..cc612c5d5427 100644 --- a/drivers/input/keyboard/stowaway.c +++ b/drivers/input/keyboard/stowaway.c | |||
@@ -170,15 +170,4 @@ static struct serio_driver skbd_drv = { | |||
170 | .disconnect = skbd_disconnect, | 170 | .disconnect = skbd_disconnect, |
171 | }; | 171 | }; |
172 | 172 | ||
173 | static int __init skbd_init(void) | 173 | module_serio_driver(skbd_drv); |
174 | { | ||
175 | return serio_register_driver(&skbd_drv); | ||
176 | } | ||
177 | |||
178 | static void __exit skbd_exit(void) | ||
179 | { | ||
180 | serio_unregister_driver(&skbd_drv); | ||
181 | } | ||
182 | |||
183 | module_init(skbd_init); | ||
184 | module_exit(skbd_exit); | ||
diff --git a/drivers/input/keyboard/sunkbd.c b/drivers/input/keyboard/sunkbd.c index a99a04b03ee4..5f836b1638c1 100644 --- a/drivers/input/keyboard/sunkbd.c +++ b/drivers/input/keyboard/sunkbd.c | |||
@@ -369,19 +369,4 @@ static struct serio_driver sunkbd_drv = { | |||
369 | .disconnect = sunkbd_disconnect, | 369 | .disconnect = sunkbd_disconnect, |
370 | }; | 370 | }; |
371 | 371 | ||
372 | /* | 372 | module_serio_driver(sunkbd_drv); |
373 | * The functions for insering/removing us as a module. | ||
374 | */ | ||
375 | |||
376 | static int __init sunkbd_init(void) | ||
377 | { | ||
378 | return serio_register_driver(&sunkbd_drv); | ||
379 | } | ||
380 | |||
381 | static void __exit sunkbd_exit(void) | ||
382 | { | ||
383 | serio_unregister_driver(&sunkbd_drv); | ||
384 | } | ||
385 | |||
386 | module_init(sunkbd_init); | ||
387 | module_exit(sunkbd_exit); | ||
diff --git a/drivers/input/keyboard/xtkbd.c b/drivers/input/keyboard/xtkbd.c index 37b01d777a4a..d050d9d0011b 100644 --- a/drivers/input/keyboard/xtkbd.c +++ b/drivers/input/keyboard/xtkbd.c | |||
@@ -169,15 +169,4 @@ static struct serio_driver xtkbd_drv = { | |||
169 | .disconnect = xtkbd_disconnect, | 169 | .disconnect = xtkbd_disconnect, |
170 | }; | 170 | }; |
171 | 171 | ||
172 | static int __init xtkbd_init(void) | 172 | module_serio_driver(xtkbd_drv); |
173 | { | ||
174 | return serio_register_driver(&xtkbd_drv); | ||
175 | } | ||
176 | |||
177 | static void __exit xtkbd_exit(void) | ||
178 | { | ||
179 | serio_unregister_driver(&xtkbd_drv); | ||
180 | } | ||
181 | |||
182 | module_init(xtkbd_init); | ||
183 | module_exit(xtkbd_exit); | ||
diff --git a/drivers/input/mouse/sermouse.c b/drivers/input/mouse/sermouse.c index 17ff137b9bd5..d5928fd0c914 100644 --- a/drivers/input/mouse/sermouse.c +++ b/drivers/input/mouse/sermouse.c | |||
@@ -355,15 +355,4 @@ static struct serio_driver sermouse_drv = { | |||
355 | .disconnect = sermouse_disconnect, | 355 | .disconnect = sermouse_disconnect, |
356 | }; | 356 | }; |
357 | 357 | ||
358 | static int __init sermouse_init(void) | 358 | module_serio_driver(sermouse_drv); |
359 | { | ||
360 | return serio_register_driver(&sermouse_drv); | ||
361 | } | ||
362 | |||
363 | static void __exit sermouse_exit(void) | ||
364 | { | ||
365 | serio_unregister_driver(&sermouse_drv); | ||
366 | } | ||
367 | |||
368 | module_init(sermouse_init); | ||
369 | module_exit(sermouse_exit); | ||
diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c index eb9a3cfbeefa..e900d465aaf6 100644 --- a/drivers/input/mouse/vsxxxaa.c +++ b/drivers/input/mouse/vsxxxaa.c | |||
@@ -548,16 +548,4 @@ static struct serio_driver vsxxxaa_drv = { | |||
548 | .disconnect = vsxxxaa_disconnect, | 548 | .disconnect = vsxxxaa_disconnect, |
549 | }; | 549 | }; |
550 | 550 | ||
551 | static int __init vsxxxaa_init(void) | 551 | module_serio_driver(vsxxxaa_drv); |
552 | { | ||
553 | return serio_register_driver(&vsxxxaa_drv); | ||
554 | } | ||
555 | |||
556 | static void __exit vsxxxaa_exit(void) | ||
557 | { | ||
558 | serio_unregister_driver(&vsxxxaa_drv); | ||
559 | } | ||
560 | |||
561 | module_init(vsxxxaa_init); | ||
562 | module_exit(vsxxxaa_exit); | ||
563 | |||
diff --git a/drivers/input/serio/ps2mult.c b/drivers/input/serio/ps2mult.c index 15aa81c9f1fb..a76fb64f03db 100644 --- a/drivers/input/serio/ps2mult.c +++ b/drivers/input/serio/ps2mult.c | |||
@@ -304,15 +304,4 @@ static struct serio_driver ps2mult_drv = { | |||
304 | .reconnect = ps2mult_reconnect, | 304 | .reconnect = ps2mult_reconnect, |
305 | }; | 305 | }; |
306 | 306 | ||
307 | static int __init ps2mult_init(void) | 307 | module_serio_driver(ps2mult_drv); |
308 | { | ||
309 | return serio_register_driver(&ps2mult_drv); | ||
310 | } | ||
311 | |||
312 | static void __exit ps2mult_exit(void) | ||
313 | { | ||
314 | serio_unregister_driver(&ps2mult_drv); | ||
315 | } | ||
316 | |||
317 | module_init(ps2mult_init); | ||
318 | module_exit(ps2mult_exit); | ||
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c index 4494233d331a..948fd5a045f7 100644 --- a/drivers/input/serio/serio_raw.c +++ b/drivers/input/serio/serio_raw.c | |||
@@ -432,15 +432,4 @@ static struct serio_driver serio_raw_drv = { | |||
432 | .manual_bind = true, | 432 | .manual_bind = true, |
433 | }; | 433 | }; |
434 | 434 | ||
435 | static int __init serio_raw_init(void) | 435 | module_serio_driver(serio_raw_drv); |
436 | { | ||
437 | return serio_register_driver(&serio_raw_drv); | ||
438 | } | ||
439 | |||
440 | static void __exit serio_raw_exit(void) | ||
441 | { | ||
442 | serio_unregister_driver(&serio_raw_drv); | ||
443 | } | ||
444 | |||
445 | module_init(serio_raw_init); | ||
446 | module_exit(serio_raw_exit); | ||
diff --git a/drivers/input/touchscreen/dynapro.c b/drivers/input/touchscreen/dynapro.c index 455353908bdf..1809677a6513 100644 --- a/drivers/input/touchscreen/dynapro.c +++ b/drivers/input/touchscreen/dynapro.c | |||
@@ -188,19 +188,4 @@ static struct serio_driver dynapro_drv = { | |||
188 | .disconnect = dynapro_disconnect, | 188 | .disconnect = dynapro_disconnect, |
189 | }; | 189 | }; |
190 | 190 | ||
191 | /* | 191 | module_serio_driver(dynapro_drv); |
192 | * The functions for inserting/removing us as a module. | ||
193 | */ | ||
194 | |||
195 | static int __init dynapro_init(void) | ||
196 | { | ||
197 | return serio_register_driver(&dynapro_drv); | ||
198 | } | ||
199 | |||
200 | static void __exit dynapro_exit(void) | ||
201 | { | ||
202 | serio_unregister_driver(&dynapro_drv); | ||
203 | } | ||
204 | |||
205 | module_init(dynapro_init); | ||
206 | module_exit(dynapro_exit); | ||
diff --git a/drivers/input/touchscreen/elo.c b/drivers/input/touchscreen/elo.c index 486d31ba9c09..957423d1471d 100644 --- a/drivers/input/touchscreen/elo.c +++ b/drivers/input/touchscreen/elo.c | |||
@@ -405,19 +405,4 @@ static struct serio_driver elo_drv = { | |||
405 | .disconnect = elo_disconnect, | 405 | .disconnect = elo_disconnect, |
406 | }; | 406 | }; |
407 | 407 | ||
408 | /* | 408 | module_serio_driver(elo_drv); |
409 | * The functions for inserting/removing us as a module. | ||
410 | */ | ||
411 | |||
412 | static int __init elo_init(void) | ||
413 | { | ||
414 | return serio_register_driver(&elo_drv); | ||
415 | } | ||
416 | |||
417 | static void __exit elo_exit(void) | ||
418 | { | ||
419 | serio_unregister_driver(&elo_drv); | ||
420 | } | ||
421 | |||
422 | module_init(elo_init); | ||
423 | module_exit(elo_exit); | ||
diff --git a/drivers/input/touchscreen/fujitsu_ts.c b/drivers/input/touchscreen/fujitsu_ts.c index 80b21800355f..10794ddbdf58 100644 --- a/drivers/input/touchscreen/fujitsu_ts.c +++ b/drivers/input/touchscreen/fujitsu_ts.c | |||
@@ -175,15 +175,4 @@ static struct serio_driver fujitsu_drv = { | |||
175 | .disconnect = fujitsu_disconnect, | 175 | .disconnect = fujitsu_disconnect, |
176 | }; | 176 | }; |
177 | 177 | ||
178 | static int __init fujitsu_init(void) | 178 | module_serio_driver(fujitsu_drv); |
179 | { | ||
180 | return serio_register_driver(&fujitsu_drv); | ||
181 | } | ||
182 | |||
183 | static void __exit fujitsu_exit(void) | ||
184 | { | ||
185 | serio_unregister_driver(&fujitsu_drv); | ||
186 | } | ||
187 | |||
188 | module_init(fujitsu_init); | ||
189 | module_exit(fujitsu_exit); | ||
diff --git a/drivers/input/touchscreen/gunze.c b/drivers/input/touchscreen/gunze.c index a54f90e02ab6..41c71766bf18 100644 --- a/drivers/input/touchscreen/gunze.c +++ b/drivers/input/touchscreen/gunze.c | |||
@@ -186,19 +186,4 @@ static struct serio_driver gunze_drv = { | |||
186 | .disconnect = gunze_disconnect, | 186 | .disconnect = gunze_disconnect, |
187 | }; | 187 | }; |
188 | 188 | ||
189 | /* | 189 | module_serio_driver(gunze_drv); |
190 | * The functions for inserting/removing us as a module. | ||
191 | */ | ||
192 | |||
193 | static int __init gunze_init(void) | ||
194 | { | ||
195 | return serio_register_driver(&gunze_drv); | ||
196 | } | ||
197 | |||
198 | static void __exit gunze_exit(void) | ||
199 | { | ||
200 | serio_unregister_driver(&gunze_drv); | ||
201 | } | ||
202 | |||
203 | module_init(gunze_init); | ||
204 | module_exit(gunze_exit); | ||
diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c index 6107e563e681..b9e8686a6f1c 100644 --- a/drivers/input/touchscreen/h3600_ts_input.c +++ b/drivers/input/touchscreen/h3600_ts_input.c | |||
@@ -476,19 +476,4 @@ static struct serio_driver h3600ts_drv = { | |||
476 | .disconnect = h3600ts_disconnect, | 476 | .disconnect = h3600ts_disconnect, |
477 | }; | 477 | }; |
478 | 478 | ||
479 | /* | 479 | module_serio_driver(h3600ts_drv); |
480 | * The functions for inserting/removing us as a module. | ||
481 | */ | ||
482 | |||
483 | static int __init h3600ts_init(void) | ||
484 | { | ||
485 | return serio_register_driver(&h3600ts_drv); | ||
486 | } | ||
487 | |||
488 | static void __exit h3600ts_exit(void) | ||
489 | { | ||
490 | serio_unregister_driver(&h3600ts_drv); | ||
491 | } | ||
492 | |||
493 | module_init(h3600ts_init); | ||
494 | module_exit(h3600ts_exit); | ||
diff --git a/drivers/input/touchscreen/hampshire.c b/drivers/input/touchscreen/hampshire.c index 2da6cc31bb21..0cc47ea98acf 100644 --- a/drivers/input/touchscreen/hampshire.c +++ b/drivers/input/touchscreen/hampshire.c | |||
@@ -187,19 +187,4 @@ static struct serio_driver hampshire_drv = { | |||
187 | .disconnect = hampshire_disconnect, | 187 | .disconnect = hampshire_disconnect, |
188 | }; | 188 | }; |
189 | 189 | ||
190 | /* | 190 | module_serio_driver(hampshire_drv); |
191 | * The functions for inserting/removing us as a module. | ||
192 | */ | ||
193 | |||
194 | static int __init hampshire_init(void) | ||
195 | { | ||
196 | return serio_register_driver(&hampshire_drv); | ||
197 | } | ||
198 | |||
199 | static void __exit hampshire_exit(void) | ||
200 | { | ||
201 | serio_unregister_driver(&hampshire_drv); | ||
202 | } | ||
203 | |||
204 | module_init(hampshire_init); | ||
205 | module_exit(hampshire_exit); | ||
diff --git a/drivers/input/touchscreen/inexio.c b/drivers/input/touchscreen/inexio.c index 192ade0a0fb9..a29c99c32245 100644 --- a/drivers/input/touchscreen/inexio.c +++ b/drivers/input/touchscreen/inexio.c | |||
@@ -189,19 +189,4 @@ static struct serio_driver inexio_drv = { | |||
189 | .disconnect = inexio_disconnect, | 189 | .disconnect = inexio_disconnect, |
190 | }; | 190 | }; |
191 | 191 | ||
192 | /* | 192 | module_serio_driver(inexio_drv); |
193 | * The functions for inserting/removing us as a module. | ||
194 | */ | ||
195 | |||
196 | static int __init inexio_init(void) | ||
197 | { | ||
198 | return serio_register_driver(&inexio_drv); | ||
199 | } | ||
200 | |||
201 | static void __exit inexio_exit(void) | ||
202 | { | ||
203 | serio_unregister_driver(&inexio_drv); | ||
204 | } | ||
205 | |||
206 | module_init(inexio_init); | ||
207 | module_exit(inexio_exit); | ||
diff --git a/drivers/input/touchscreen/mtouch.c b/drivers/input/touchscreen/mtouch.c index 9077228418b7..eb66b7c37c2f 100644 --- a/drivers/input/touchscreen/mtouch.c +++ b/drivers/input/touchscreen/mtouch.c | |||
@@ -202,19 +202,4 @@ static struct serio_driver mtouch_drv = { | |||
202 | .disconnect = mtouch_disconnect, | 202 | .disconnect = mtouch_disconnect, |
203 | }; | 203 | }; |
204 | 204 | ||
205 | /* | 205 | module_serio_driver(mtouch_drv); |
206 | * The functions for inserting/removing us as a module. | ||
207 | */ | ||
208 | |||
209 | static int __init mtouch_init(void) | ||
210 | { | ||
211 | return serio_register_driver(&mtouch_drv); | ||
212 | } | ||
213 | |||
214 | static void __exit mtouch_exit(void) | ||
215 | { | ||
216 | serio_unregister_driver(&mtouch_drv); | ||
217 | } | ||
218 | |||
219 | module_init(mtouch_init); | ||
220 | module_exit(mtouch_exit); | ||
diff --git a/drivers/input/touchscreen/penmount.c b/drivers/input/touchscreen/penmount.c index 4c012fb2b01e..4ccde45b9da2 100644 --- a/drivers/input/touchscreen/penmount.c +++ b/drivers/input/touchscreen/penmount.c | |||
@@ -317,19 +317,4 @@ static struct serio_driver pm_drv = { | |||
317 | .disconnect = pm_disconnect, | 317 | .disconnect = pm_disconnect, |
318 | }; | 318 | }; |
319 | 319 | ||
320 | /* | 320 | module_serio_driver(pm_drv); |
321 | * The functions for inserting/removing us as a module. | ||
322 | */ | ||
323 | |||
324 | static int __init pm_init(void) | ||
325 | { | ||
326 | return serio_register_driver(&pm_drv); | ||
327 | } | ||
328 | |||
329 | static void __exit pm_exit(void) | ||
330 | { | ||
331 | serio_unregister_driver(&pm_drv); | ||
332 | } | ||
333 | |||
334 | module_init(pm_init); | ||
335 | module_exit(pm_exit); | ||
diff --git a/drivers/input/touchscreen/touchit213.c b/drivers/input/touchscreen/touchit213.c index d1297ba19daf..5f29e5b8e1c1 100644 --- a/drivers/input/touchscreen/touchit213.c +++ b/drivers/input/touchscreen/touchit213.c | |||
@@ -216,19 +216,4 @@ static struct serio_driver touchit213_drv = { | |||
216 | .disconnect = touchit213_disconnect, | 216 | .disconnect = touchit213_disconnect, |
217 | }; | 217 | }; |
218 | 218 | ||
219 | /* | 219 | module_serio_driver(touchit213_drv); |
220 | * The functions for inserting/removing us as a module. | ||
221 | */ | ||
222 | |||
223 | static int __init touchit213_init(void) | ||
224 | { | ||
225 | return serio_register_driver(&touchit213_drv); | ||
226 | } | ||
227 | |||
228 | static void __exit touchit213_exit(void) | ||
229 | { | ||
230 | serio_unregister_driver(&touchit213_drv); | ||
231 | } | ||
232 | |||
233 | module_init(touchit213_init); | ||
234 | module_exit(touchit213_exit); | ||
diff --git a/drivers/input/touchscreen/touchright.c b/drivers/input/touchscreen/touchright.c index 3a5c142c2a78..8a2887daf194 100644 --- a/drivers/input/touchscreen/touchright.c +++ b/drivers/input/touchscreen/touchright.c | |||
@@ -176,19 +176,4 @@ static struct serio_driver tr_drv = { | |||
176 | .disconnect = tr_disconnect, | 176 | .disconnect = tr_disconnect, |
177 | }; | 177 | }; |
178 | 178 | ||
179 | /* | 179 | module_serio_driver(tr_drv); |
180 | * The functions for inserting/removing us as a module. | ||
181 | */ | ||
182 | |||
183 | static int __init tr_init(void) | ||
184 | { | ||
185 | return serio_register_driver(&tr_drv); | ||
186 | } | ||
187 | |||
188 | static void __exit tr_exit(void) | ||
189 | { | ||
190 | serio_unregister_driver(&tr_drv); | ||
191 | } | ||
192 | |||
193 | module_init(tr_init); | ||
194 | module_exit(tr_exit); | ||
diff --git a/drivers/input/touchscreen/touchwin.c b/drivers/input/touchscreen/touchwin.c index 763a656a59f8..588cdcb839dd 100644 --- a/drivers/input/touchscreen/touchwin.c +++ b/drivers/input/touchscreen/touchwin.c | |||
@@ -183,19 +183,4 @@ static struct serio_driver tw_drv = { | |||
183 | .disconnect = tw_disconnect, | 183 | .disconnect = tw_disconnect, |
184 | }; | 184 | }; |
185 | 185 | ||
186 | /* | 186 | module_serio_driver(tw_drv); |
187 | * The functions for inserting/removing us as a module. | ||
188 | */ | ||
189 | |||
190 | static int __init tw_init(void) | ||
191 | { | ||
192 | return serio_register_driver(&tw_drv); | ||
193 | } | ||
194 | |||
195 | static void __exit tw_exit(void) | ||
196 | { | ||
197 | serio_unregister_driver(&tw_drv); | ||
198 | } | ||
199 | |||
200 | module_init(tw_init); | ||
201 | module_exit(tw_exit); | ||
diff --git a/drivers/input/touchscreen/tsc40.c b/drivers/input/touchscreen/tsc40.c index 29d5ed4dd31c..63209aaa55f0 100644 --- a/drivers/input/touchscreen/tsc40.c +++ b/drivers/input/touchscreen/tsc40.c | |||
@@ -167,17 +167,7 @@ static struct serio_driver tsc_drv = { | |||
167 | .disconnect = tsc_disconnect, | 167 | .disconnect = tsc_disconnect, |
168 | }; | 168 | }; |
169 | 169 | ||
170 | static int __init tsc_ser_init(void) | 170 | module_serio_driver(tsc_drv); |
171 | { | ||
172 | return serio_register_driver(&tsc_drv); | ||
173 | } | ||
174 | module_init(tsc_ser_init); | ||
175 | |||
176 | static void __exit tsc_exit(void) | ||
177 | { | ||
178 | serio_unregister_driver(&tsc_drv); | ||
179 | } | ||
180 | module_exit(tsc_exit); | ||
181 | 171 | ||
182 | MODULE_AUTHOR("Sebastian Andrzej Siewior <bigeasy@linutronix.de>"); | 172 | MODULE_AUTHOR("Sebastian Andrzej Siewior <bigeasy@linutronix.de>"); |
183 | MODULE_DESCRIPTION(DRIVER_DESC); | 173 | MODULE_DESCRIPTION(DRIVER_DESC); |
diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c index 1569a3934ab2..8f9ad2f893b8 100644 --- a/drivers/input/touchscreen/wacom_w8001.c +++ b/drivers/input/touchscreen/wacom_w8001.c | |||
@@ -594,15 +594,4 @@ static struct serio_driver w8001_drv = { | |||
594 | .disconnect = w8001_disconnect, | 594 | .disconnect = w8001_disconnect, |
595 | }; | 595 | }; |
596 | 596 | ||
597 | static int __init w8001_init(void) | 597 | module_serio_driver(w8001_drv); |
598 | { | ||
599 | return serio_register_driver(&w8001_drv); | ||
600 | } | ||
601 | |||
602 | static void __exit w8001_exit(void) | ||
603 | { | ||
604 | serio_unregister_driver(&w8001_drv); | ||
605 | } | ||
606 | |||
607 | module_init(w8001_init); | ||
608 | module_exit(w8001_exit); | ||