Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 98a84131926ebafe868c65631b69d4912922211e

Authored by Axel Lin
Committed by Dmitry Torokhov
1 parent 45b2604eaa
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

Input: gameport - use module_gameport_driver 

This patch converts the drivers in drivers/input/* to use
module_gameport_driver() macro which makes the code smaller
and a bit simpler.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Showing 11 changed files with 11 additions and 136 deletions Side-by-side Diff

drivers/input/joystick/a3d.c
Diff comments   View file @ 98a8413
... ... @@ -413,16 +413,5 @@
413 413 .disconnect = a3d_disconnect,
414 414 };
415 415  
416   -static int __init a3d_init(void)
417   -{
418   - return gameport_register_driver(&a3d_drv);
419   -}
420   -
421   -static void __exit a3d_exit(void)
422   -{
423   - gameport_unregister_driver(&a3d_drv);
424   -}
425   -
426   -module_init(a3d_init);
427   -module_exit(a3d_exit);
  416 +module_gameport_driver(a3d_drv);
drivers/input/joystick/adi.c
Diff comments   View file @ 98a8413
... ... @@ -557,10 +557,6 @@
557 557 kfree(port);
558 558 }
559 559  
560   -/*
561   - * The gameport device structure.
562   - */
563   -
564 560 static struct gameport_driver adi_drv = {
565 561 .driver = {
566 562 .name = "adi",
... ... @@ -570,16 +566,5 @@
570 566 .disconnect = adi_disconnect,
571 567 };
572 568  
573   -static int __init adi_init(void)
574   -{
575   - return gameport_register_driver(&adi_drv);
576   -}
577   -
578   -static void __exit adi_exit(void)
579   -{
580   - gameport_unregister_driver(&adi_drv);
581   -}
582   -
583   -module_init(adi_init);
584   -module_exit(adi_exit);
  569 +module_gameport_driver(adi_drv);
drivers/input/joystick/cobra.c
Diff comments   View file @ 98a8413
... ... @@ -261,16 +261,5 @@
261 261 .disconnect = cobra_disconnect,
262 262 };
263 263  
264   -static int __init cobra_init(void)
265   -{
266   - return gameport_register_driver(&cobra_drv);
267   -}
268   -
269   -static void __exit cobra_exit(void)
270   -{
271   - gameport_unregister_driver(&cobra_drv);
272   -}
273   -
274   -module_init(cobra_init);
275   -module_exit(cobra_exit);
  264 +module_gameport_driver(cobra_drv);
drivers/input/joystick/gf2k.c
Diff comments   View file @ 98a8413
... ... @@ -373,16 +373,5 @@
373 373 .disconnect = gf2k_disconnect,
374 374 };
375 375  
376   -static int __init gf2k_init(void)
377   -{
378   - return gameport_register_driver(&gf2k_drv);
379   -}
380   -
381   -static void __exit gf2k_exit(void)
382   -{
383   - gameport_unregister_driver(&gf2k_drv);
384   -}
385   -
386   -module_init(gf2k_init);
387   -module_exit(gf2k_exit);
  376 +module_gameport_driver(gf2k_drv);
drivers/input/joystick/grip.c
Diff comments   View file @ 98a8413
... ... @@ -424,16 +424,5 @@
424 424 .disconnect = grip_disconnect,
425 425 };
426 426  
427   -static int __init grip_init(void)
428   -{
429   - return gameport_register_driver(&grip_drv);
430   -}
431   -
432   -static void __exit grip_exit(void)
433   -{
434   - gameport_unregister_driver(&grip_drv);
435   -}
436   -
437   -module_init(grip_init);
438   -module_exit(grip_exit);
  427 +module_gameport_driver(grip_drv);
drivers/input/joystick/grip_mp.c
Diff comments   View file @ 98a8413
... ... @@ -687,16 +687,5 @@
687 687 .disconnect = grip_disconnect,
688 688 };
689 689  
690   -static int __init grip_init(void)
691   -{
692   - return gameport_register_driver(&grip_drv);
693   -}
694   -
695   -static void __exit grip_exit(void)
696   -{
697   - gameport_unregister_driver(&grip_drv);
698   -}
699   -
700   -module_init(grip_init);
701   -module_exit(grip_exit);
  690 +module_gameport_driver(grip_drv);
drivers/input/joystick/guillemot.c
Diff comments   View file @ 98a8413
... ... @@ -281,16 +281,5 @@
281 281 .disconnect = guillemot_disconnect,
282 282 };
283 283  
284   -static int __init guillemot_init(void)
285   -{
286   - return gameport_register_driver(&guillemot_drv);
287   -}
288   -
289   -static void __exit guillemot_exit(void)
290   -{
291   - gameport_unregister_driver(&guillemot_drv);
292   -}
293   -
294   -module_init(guillemot_init);
295   -module_exit(guillemot_exit);
  284 +module_gameport_driver(guillemot_drv);
drivers/input/joystick/interact.c
Diff comments   View file @ 98a8413
... ... @@ -311,16 +311,5 @@
311 311 .disconnect = interact_disconnect,
312 312 };
313 313  
314   -static int __init interact_init(void)
315   -{
316   - return gameport_register_driver(&interact_drv);
317   -}
318   -
319   -static void __exit interact_exit(void)
320   -{
321   - gameport_unregister_driver(&interact_drv);
322   -}
323   -
324   -module_init(interact_init);
325   -module_exit(interact_exit);
  314 +module_gameport_driver(interact_drv);
drivers/input/joystick/joydump.c
Diff comments   View file @ 98a8413
... ... @@ -159,16 +159,5 @@
159 159 .disconnect = joydump_disconnect,
160 160 };
161 161  
162   -static int __init joydump_init(void)
163   -{
164   - return gameport_register_driver(&joydump_drv);
165   -}
166   -
167   -static void __exit joydump_exit(void)
168   -{
169   - gameport_unregister_driver(&joydump_drv);
170   -}
171   -
172   -module_init(joydump_init);
173   -module_exit(joydump_exit);
  162 +module_gameport_driver(joydump_drv);
drivers/input/joystick/sidewinder.c
Diff comments   View file @ 98a8413
... ... @@ -820,16 +820,5 @@
820 820 .disconnect = sw_disconnect,
821 821 };
822 822  
823   -static int __init sw_init(void)
824   -{
825   - return gameport_register_driver(&sw_drv);
826   -}
827   -
828   -static void __exit sw_exit(void)
829   -{
830   - gameport_unregister_driver(&sw_drv);
831   -}
832   -
833   -module_init(sw_init);
834   -module_exit(sw_exit);
  823 +module_gameport_driver(sw_drv);
drivers/input/joystick/tmdc.c
Diff comments   View file @ 98a8413
... ... @@ -436,16 +436,5 @@
436 436 .disconnect = tmdc_disconnect,
437 437 };
438 438  
439   -static int __init tmdc_init(void)
440   -{
441   - return gameport_register_driver(&tmdc_drv);
442   -}
443   -
444   -static void __exit tmdc_exit(void)
445   -{
446   - gameport_unregister_driver(&tmdc_drv);
447   -}
448   -
449   -module_init(tmdc_init);
450   -module_exit(tmdc_exit);
  439 +module_gameport_driver(tmdc_drv);