Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 65ac9f7a23c934ee8c40dc20955e75db4924bfea

Authored by Axel Lin
Committed by Dmitry Torokhov
1 parent fa7f86d157
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: serio - use module_serio_driver 

This patch converts the drivers in drivers/input/* to use
module_serio_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 31 changed files with 31 additions and 452 deletions Side-by-side Diff

drivers/input/joystick/magellan.c
Diff comments   View file @ 65ac9f7
... ... @@ -222,20 +222,5 @@
222 222 .disconnect = magellan_disconnect,
223 223 };
224 224  
225   -/*
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);
  225 +module_serio_driver(magellan_drv);
drivers/input/joystick/spaceball.c
Diff comments   View file @ 65ac9f7
... ... @@ -296,20 +296,5 @@
296 296 .disconnect = spaceball_disconnect,
297 297 };
298 298  
299   -/*
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);
  299 +module_serio_driver(spaceball_drv);
drivers/input/joystick/spaceorb.c
Diff comments   View file @ 65ac9f7
... ... @@ -237,20 +237,5 @@
237 237 .disconnect = spaceorb_disconnect,
238 238 };
239 239  
240   -/*
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);
  240 +module_serio_driver(spaceorb_drv);
drivers/input/joystick/stinger.c
Diff comments   View file @ 65ac9f7
... ... @@ -208,20 +208,5 @@
208 208 .disconnect = stinger_disconnect,
209 209 };
210 210  
211   -/*
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);
  211 +module_serio_driver(stinger_drv);
drivers/input/joystick/twidjoy.c
Diff comments   View file @ 65ac9f7
... ... @@ -257,20 +257,5 @@
257 257 .disconnect = twidjoy_disconnect,
258 258 };
259 259  
260   -/*
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);
  260 +module_serio_driver(twidjoy_drv);
drivers/input/joystick/warrior.c
Diff comments   View file @ 65ac9f7
... ... @@ -217,20 +217,5 @@
217 217 .disconnect = warrior_disconnect,
218 218 };
219 219  
220   -/*
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);
  220 +module_serio_driver(warrior_drv);
drivers/input/joystick/zhenhua.c
Diff comments   View file @ 65ac9f7
... ... @@ -225,20 +225,5 @@
225 225 .disconnect = zhenhua_disconnect,
226 226 };
227 227  
228   -/*
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);
  228 +module_serio_driver(zhenhua_drv);
drivers/input/keyboard/hil_kbd.c
Diff comments   View file @ 65ac9f7
... ... @@ -583,16 +583,5 @@
583 583 .interrupt = hil_dev_interrupt
584 584 };
585 585  
586   -static int __init hil_dev_init(void)
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);
  586 +module_serio_driver(hil_serio_drv);
drivers/input/keyboard/lkkbd.c
Diff comments   View file @ 65ac9f7
... ... @@ -731,19 +731,5 @@
731 731 .interrupt = lkkbd_interrupt,
732 732 };
733 733  
734   -/*
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);
  734 +module_serio_driver(lkkbd_drv);
drivers/input/keyboard/newtonkbd.c
Diff comments   View file @ 65ac9f7
... ... @@ -166,16 +166,5 @@
166 166 .disconnect = nkbd_disconnect,
167 167 };
168 168  
169   -static int __init nkbd_init(void)
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);
  169 +module_serio_driver(nkbd_drv);
drivers/input/keyboard/stowaway.c
Diff comments   View file @ 65ac9f7
... ... @@ -170,16 +170,5 @@
170 170 .disconnect = skbd_disconnect,
171 171 };
172 172  
173   -static int __init skbd_init(void)
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);
  173 +module_serio_driver(skbd_drv);
drivers/input/keyboard/sunkbd.c
Diff comments   View file @ 65ac9f7
... ... @@ -369,20 +369,5 @@
369 369 .disconnect = sunkbd_disconnect,
370 370 };
371 371  
372   -/*
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);
  372 +module_serio_driver(sunkbd_drv);
drivers/input/keyboard/xtkbd.c
Diff comments   View file @ 65ac9f7
... ... @@ -169,16 +169,5 @@
169 169 .disconnect = xtkbd_disconnect,
170 170 };
171 171  
172   -static int __init xtkbd_init(void)
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);
  172 +module_serio_driver(xtkbd_drv);
drivers/input/mouse/sermouse.c
Diff comments   View file @ 65ac9f7
... ... @@ -355,16 +355,5 @@
355 355 .disconnect = sermouse_disconnect,
356 356 };
357 357  
358   -static int __init sermouse_init(void)
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);
  358 +module_serio_driver(sermouse_drv);
drivers/input/mouse/vsxxxaa.c
Diff comments   View file @ 65ac9f7
... ... @@ -548,16 +548,5 @@
548 548 .disconnect = vsxxxaa_disconnect,
549 549 };
550 550  
551   -static int __init vsxxxaa_init(void)
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);
  551 +module_serio_driver(vsxxxaa_drv);
drivers/input/serio/ps2mult.c
Diff comments   View file @ 65ac9f7
... ... @@ -304,16 +304,5 @@
304 304 .reconnect = ps2mult_reconnect,
305 305 };
306 306  
307   -static int __init ps2mult_init(void)
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);
  307 +module_serio_driver(ps2mult_drv);
drivers/input/serio/serio_raw.c
Diff comments   View file @ 65ac9f7
... ... @@ -432,16 +432,5 @@
432 432 .manual_bind = true,
433 433 };
434 434  
435   -static int __init serio_raw_init(void)
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);
  435 +module_serio_driver(serio_raw_drv);
drivers/input/touchscreen/dynapro.c
Diff comments   View file @ 65ac9f7
... ... @@ -188,20 +188,5 @@
188 188 .disconnect = dynapro_disconnect,
189 189 };
190 190  
191   -/*
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);
  191 +module_serio_driver(dynapro_drv);
drivers/input/touchscreen/elo.c
Diff comments   View file @ 65ac9f7
... ... @@ -405,20 +405,5 @@
405 405 .disconnect = elo_disconnect,
406 406 };
407 407  
408   -/*
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);
  408 +module_serio_driver(elo_drv);
drivers/input/touchscreen/fujitsu_ts.c
Diff comments   View file @ 65ac9f7
... ... @@ -175,16 +175,5 @@
175 175 .disconnect = fujitsu_disconnect,
176 176 };
177 177  
178   -static int __init fujitsu_init(void)
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);
  178 +module_serio_driver(fujitsu_drv);
drivers/input/touchscreen/gunze.c
Diff comments   View file @ 65ac9f7
... ... @@ -186,20 +186,5 @@
186 186 .disconnect = gunze_disconnect,
187 187 };
188 188  
189   -/*
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);
  189 +module_serio_driver(gunze_drv);
drivers/input/touchscreen/h3600_ts_input.c
Diff comments   View file @ 65ac9f7
... ... @@ -476,20 +476,5 @@
476 476 .disconnect = h3600ts_disconnect,
477 477 };
478 478  
479   -/*
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);
  479 +module_serio_driver(h3600ts_drv);
drivers/input/touchscreen/hampshire.c
Diff comments   View file @ 65ac9f7
... ... @@ -187,20 +187,5 @@
187 187 .disconnect = hampshire_disconnect,
188 188 };
189 189  
190   -/*
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);
  190 +module_serio_driver(hampshire_drv);
drivers/input/touchscreen/inexio.c
Diff comments   View file @ 65ac9f7
... ... @@ -189,20 +189,5 @@
189 189 .disconnect = inexio_disconnect,
190 190 };
191 191  
192   -/*
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);
  192 +module_serio_driver(inexio_drv);
drivers/input/touchscreen/mtouch.c
Diff comments   View file @ 65ac9f7
... ... @@ -202,20 +202,5 @@
202 202 .disconnect = mtouch_disconnect,
203 203 };
204 204  
205   -/*
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);
  205 +module_serio_driver(mtouch_drv);
drivers/input/touchscreen/penmount.c
Diff comments   View file @ 65ac9f7
... ... @@ -317,20 +317,5 @@
317 317 .disconnect = pm_disconnect,
318 318 };
319 319  
320   -/*
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);
  320 +module_serio_driver(pm_drv);
drivers/input/touchscreen/touchit213.c
Diff comments   View file @ 65ac9f7
... ... @@ -216,20 +216,5 @@
216 216 .disconnect = touchit213_disconnect,
217 217 };
218 218  
219   -/*
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);
  219 +module_serio_driver(touchit213_drv);
drivers/input/touchscreen/touchright.c
Diff comments   View file @ 65ac9f7
... ... @@ -176,20 +176,5 @@
176 176 .disconnect = tr_disconnect,
177 177 };
178 178  
179   -/*
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);
  179 +module_serio_driver(tr_drv);
drivers/input/touchscreen/touchwin.c
Diff comments   View file @ 65ac9f7
... ... @@ -183,20 +183,5 @@
183 183 .disconnect = tw_disconnect,
184 184 };
185 185  
186   -/*
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);
  186 +module_serio_driver(tw_drv);
drivers/input/touchscreen/tsc40.c
Diff comments   View file @ 65ac9f7
... ... @@ -167,17 +167,7 @@
167 167 .disconnect = tsc_disconnect,
168 168 };
169 169  
170   -static int __init tsc_ser_init(void)
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);
  170 +module_serio_driver(tsc_drv);
181 171  
182 172 MODULE_AUTHOR("Sebastian Andrzej Siewior <bigeasy@linutronix.de>");
183 173 MODULE_DESCRIPTION(DRIVER_DESC);
drivers/input/touchscreen/wacom_w8001.c
Diff comments   View file @ 65ac9f7
... ... @@ -594,16 +594,5 @@
594 594 .disconnect = w8001_disconnect,
595 595 };
596 596  
597   -static int __init w8001_init(void)
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);
  597 +module_serio_driver(w8001_drv);