Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 56f2178898ffca84dcdfb351f0127bf5732b1610

Authored by Axel Lin
Committed by Jean Delvare
1 parent 83a638df36
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

i2c/busses: Use module_pci_driver 

Convert the drivers in drivers/i2c/busses/* to usemodule_pci_driver()
macro which makes the code smaller and a bit simpler.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Rudolf Marek <r.marek@assembler.cz>
Cc: Olof Johansson <olof@lixom.net>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Cc: Tomoya MORINAGA <tomoya.rohm@gmail.com>

Showing 16 changed files with 16 additions and 200 deletions Side-by-side Diff

drivers/i2c/busses/i2c-ali1535.c
Diff comments   View file @ 56f2178
... ... @@ -531,23 +531,12 @@
531 531 .remove = __devexit_p(ali1535_remove),
532 532 };
533 533  
534   -static int __init i2c_ali1535_init(void)
535   -{
536   - return pci_register_driver(&ali1535_driver);
537   -}
  534 +module_pci_driver(ali1535_driver);
538 535  
539   -static void __exit i2c_ali1535_exit(void)
540   -{
541   - pci_unregister_driver(&ali1535_driver);
542   -}
543   -
544 536 MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, "
545 537 "Philip Edelbrock <phil@netroedge.com>, "
546 538 "Mark D. Studebaker <mdsxyz123@yahoo.com> "
547 539 "and Dan Eaton <dan.eaton@rocketlogix.com>");
548 540 MODULE_DESCRIPTION("ALI1535 SMBus driver");
549 541 MODULE_LICENSE("GPL");
550   -
551   -module_init(i2c_ali1535_init);
552   -module_exit(i2c_ali1535_exit);
drivers/i2c/busses/i2c-ali1563.c
Diff comments   View file @ 56f2178
... ... @@ -431,19 +431,7 @@
431 431 .remove = __devexit_p(ali1563_remove),
432 432 };
433 433  
434   -static int __init ali1563_init(void)
435   -{
436   - return pci_register_driver(&ali1563_pci_driver);
437   -}
438   -
439   -module_init(ali1563_init);
440   -
441   -static void __exit ali1563_exit(void)
442   -{
443   - pci_unregister_driver(&ali1563_pci_driver);
444   -}
445   -
446   -module_exit(ali1563_exit);
  434 +module_pci_driver(ali1563_pci_driver);
447 435  
448 436 MODULE_LICENSE("GPL");
drivers/i2c/busses/i2c-ali15x3.c
Diff comments   View file @ 56f2178
... ... @@ -513,22 +513,11 @@
513 513 .remove = __devexit_p(ali15x3_remove),
514 514 };
515 515  
516   -static int __init i2c_ali15x3_init(void)
517   -{
518   - return pci_register_driver(&ali15x3_driver);
519   -}
  516 +module_pci_driver(ali15x3_driver);
520 517  
521   -static void __exit i2c_ali15x3_exit(void)
522   -{
523   - pci_unregister_driver(&ali15x3_driver);
524   -}
525   -
526 518 MODULE_AUTHOR ("Frodo Looijaard <frodol@dds.nl>, "
527 519 "Philip Edelbrock <phil@netroedge.com>, "
528 520 "and Mark D. Studebaker <mdsxyz123@yahoo.com>");
529 521 MODULE_DESCRIPTION("ALI15X3 SMBus driver");
530 522 MODULE_LICENSE("GPL");
531   -
532   -module_init(i2c_ali15x3_init);
533   -module_exit(i2c_ali15x3_exit);
drivers/i2c/busses/i2c-amd756.c
Diff comments   View file @ 56f2178
... ... @@ -410,22 +410,11 @@
410 410 .remove = __devexit_p(amd756_remove),
411 411 };
412 412  
413   -static int __init amd756_init(void)
414   -{
415   - return pci_register_driver(&amd756_driver);
416   -}
  413 +module_pci_driver(amd756_driver);
417 414  
418   -static void __exit amd756_exit(void)
419   -{
420   - pci_unregister_driver(&amd756_driver);
421   -}
422   -
423 415 MODULE_AUTHOR("Merlin Hughes <merlin@merlin.org>");
424 416 MODULE_DESCRIPTION("AMD756/766/768/8111 and nVidia nForce SMBus driver");
425 417 MODULE_LICENSE("GPL");
426 418  
427 419 EXPORT_SYMBOL(amd756_smbus);
428   -
429   -module_init(amd756_init)
430   -module_exit(amd756_exit)
drivers/i2c/busses/i2c-amd8111.c
Diff comments   View file @ 56f2178
... ... @@ -491,16 +491,5 @@
491 491 .remove = __devexit_p(amd8111_remove),
492 492 };
493 493  
494   -static int __init i2c_amd8111_init(void)
495   -{
496   - return pci_register_driver(&amd8111_driver);
497   -}
498   -
499   -static void __exit i2c_amd8111_exit(void)
500   -{
501   - pci_unregister_driver(&amd8111_driver);
502   -}
503   -
504   -module_init(i2c_amd8111_init);
505   -module_exit(i2c_amd8111_exit);
  494 +module_pci_driver(amd8111_driver);
drivers/i2c/busses/i2c-designware-pcidrv.c
Diff comments   View file @ 56f2178
... ... @@ -374,17 +374,7 @@
374 374 },
375 375 };
376 376  
377   -static int __init dw_i2c_init_driver(void)
378   -{
379   - return pci_register_driver(&dw_i2c_driver);
380   -}
381   -module_init(dw_i2c_init_driver);
382   -
383   -static void __exit dw_i2c_exit_driver(void)
384   -{
385   - pci_unregister_driver(&dw_i2c_driver);
386   -}
387   -module_exit(dw_i2c_exit_driver);
  377 +module_pci_driver(dw_i2c_driver);
388 378  
389 379 MODULE_AUTHOR("Baruch Siach <baruch@tkos.co.il>");
390 380 MODULE_DESCRIPTION("Synopsys DesignWare PCI I2C bus adapter");
drivers/i2c/busses/i2c-eg20t.c
Diff comments   View file @ 56f2178
... ... @@ -953,17 +953,7 @@
953 953 .resume = pch_i2c_resume
954 954 };
955 955  
956   -static int __init pch_pci_init(void)
957   -{
958   - return pci_register_driver(&pch_pcidriver);
959   -}
960   -module_init(pch_pci_init);
961   -
962   -static void __exit pch_pci_exit(void)
963   -{
964   - pci_unregister_driver(&pch_pcidriver);
965   -}
966   -module_exit(pch_pci_exit);
  956 +module_pci_driver(pch_pcidriver);
967 957  
968 958 MODULE_DESCRIPTION("Intel EG20T PCH/LAPIS Semico ML7213/ML7223/ML7831 IOH I2C");
969 959 MODULE_LICENSE("GPL");
drivers/i2c/busses/i2c-hydra.c
Diff comments   View file @ 56f2178
... ... @@ -156,23 +156,9 @@
156 156 .remove = __devexit_p(hydra_remove),
157 157 };
158 158  
159   -static int __init i2c_hydra_init(void)
160   -{
161   - return pci_register_driver(&hydra_driver);
162   -}
  159 +module_pci_driver(hydra_driver);
163 160  
164   -
165   -static void __exit i2c_hydra_exit(void)
166   -{
167   - pci_unregister_driver(&hydra_driver);
168   -}
169   -
170   -
171   -
172 161 MODULE_AUTHOR("Geert Uytterhoeven <geert@linux-m68k.org>");
173 162 MODULE_DESCRIPTION("i2c for Apple Hydra Mac I/O");
174 163 MODULE_LICENSE("GPL");
175   -
176   -module_init(i2c_hydra_init);
177   -module_exit(i2c_hydra_exit);
drivers/i2c/busses/i2c-intel-mid.c
Diff comments   View file @ 56f2178
... ... @@ -1116,18 +1116,7 @@
1116 1116 .remove = __devexit_p(intel_mid_i2c_remove),
1117 1117 };
1118 1118  
1119   -static int __init intel_mid_i2c_init(void)
1120   -{
1121   - return pci_register_driver(&intel_mid_i2c_driver);
1122   -}
1123   -
1124   -static void __exit intel_mid_i2c_exit(void)
1125   -{
1126   - pci_unregister_driver(&intel_mid_i2c_driver);
1127   -}
1128   -
1129   -module_init(intel_mid_i2c_init);
1130   -module_exit(intel_mid_i2c_exit);
  1119 +module_pci_driver(intel_mid_i2c_driver);
1131 1120  
1132 1121 MODULE_AUTHOR("Ba Zheng <zheng.ba@intel.com>");
1133 1122 MODULE_DESCRIPTION("I2C driver for Moorestown Platform");
drivers/i2c/busses/i2c-nforce2.c
Diff comments   View file @ 56f2178
... ... @@ -453,16 +453,5 @@
453 453 .remove = __devexit_p(nforce2_remove),
454 454 };
455 455  
456   -static int __init nforce2_init(void)
457   -{
458   - return pci_register_driver(&nforce2_driver);
459   -}
460   -
461   -static void __exit nforce2_exit(void)
462   -{
463   - pci_unregister_driver(&nforce2_driver);
464   -}
465   -
466   -module_init(nforce2_init);
467   -module_exit(nforce2_exit);
  456 +module_pci_driver(nforce2_driver);
drivers/i2c/busses/i2c-pasemi.c
Diff comments   View file @ 56f2178
... ... @@ -415,20 +415,9 @@
415 415 .remove = __devexit_p(pasemi_smb_remove),
416 416 };
417 417  
418   -static int __init pasemi_smb_init(void)
419   -{
420   - return pci_register_driver(&pasemi_smb_driver);
421   -}
  418 +module_pci_driver(pasemi_smb_driver);
422 419  
423   -static void __exit pasemi_smb_exit(void)
424   -{
425   - pci_unregister_driver(&pasemi_smb_driver);
426   -}
427   -
428 420 MODULE_LICENSE("GPL");
429 421 MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
430 422 MODULE_DESCRIPTION("PA Semi PWRficient SMBus driver");
431   -
432   -module_init(pasemi_smb_init);
433   -module_exit(pasemi_smb_exit);
drivers/i2c/busses/i2c-piix4.c
Diff comments   View file @ 56f2178
... ... @@ -544,21 +544,10 @@
544 544 .remove = __devexit_p(piix4_remove),
545 545 };
546 546  
547   -static int __init i2c_piix4_init(void)
548   -{
549   - return pci_register_driver(&piix4_driver);
550   -}
  547 +module_pci_driver(piix4_driver);
551 548  
552   -static void __exit i2c_piix4_exit(void)
553   -{
554   - pci_unregister_driver(&piix4_driver);
555   -}
556   -
557 549 MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl> and "
558 550 "Philip Edelbrock <phil@netroedge.com>");
559 551 MODULE_DESCRIPTION("PIIX4 SMBus driver");
560 552 MODULE_LICENSE("GPL");
561   -
562   -module_init(i2c_piix4_init);
563   -module_exit(i2c_piix4_exit);
drivers/i2c/busses/i2c-pxa-pci.c
Diff comments   View file @ 56f2178
... ... @@ -163,17 +163,7 @@
163 163 .remove = __devexit_p(ce4100_i2c_remove),
164 164 };
165 165  
166   -static int __init ce4100_i2c_init(void)
167   -{
168   - return pci_register_driver(&ce4100_i2c_driver);
169   -}
170   -module_init(ce4100_i2c_init);
171   -
172   -static void __exit ce4100_i2c_exit(void)
173   -{
174   - pci_unregister_driver(&ce4100_i2c_driver);
175   -}
176   -module_exit(ce4100_i2c_exit);
  166 +module_pci_driver(ce4100_i2c_driver);
177 167  
178 168 MODULE_DESCRIPTION("CE4100 PCI-I2C glue code for PXA's driver");
179 169 MODULE_LICENSE("GPL v2");
drivers/i2c/busses/i2c-sis630.c
Diff comments   View file @ 56f2178
... ... @@ -513,22 +513,9 @@
513 513 .remove = __devexit_p(sis630_remove),
514 514 };
515 515  
516   -static int __init i2c_sis630_init(void)
517   -{
518   - return pci_register_driver(&sis630_driver);
519   -}
  516 +module_pci_driver(sis630_driver);
520 517  
521   -
522   -static void __exit i2c_sis630_exit(void)
523   -{
524   - pci_unregister_driver(&sis630_driver);
525   -}
526   -
527   -
528 518 MODULE_LICENSE("GPL");
529 519 MODULE_AUTHOR("Alexander Malysh <amalysh@web.de>");
530 520 MODULE_DESCRIPTION("SIS630 SMBus driver");
531   -
532   -module_init(i2c_sis630_init);
533   -module_exit(i2c_sis630_exit);
drivers/i2c/busses/i2c-sis96x.c
Diff comments   View file @ 56f2178
... ... @@ -324,21 +324,9 @@
324 324 .remove = __devexit_p(sis96x_remove),
325 325 };
326 326  
327   -static int __init i2c_sis96x_init(void)
328   -{
329   - return pci_register_driver(&sis96x_driver);
330   -}
  327 +module_pci_driver(sis96x_driver);
331 328  
332   -static void __exit i2c_sis96x_exit(void)
333   -{
334   - pci_unregister_driver(&sis96x_driver);
335   -}
336   -
337 329 MODULE_AUTHOR("Mark M. Hoffman <mhoffman@lightlink.com>");
338 330 MODULE_DESCRIPTION("SiS96x SMBus driver");
339 331 MODULE_LICENSE("GPL");
340   -
341   -/* Register initialization functions using helper macros */
342   -module_init(i2c_sis96x_init);
343   -module_exit(i2c_sis96x_exit);
drivers/i2c/busses/i2c-via.c
Diff comments   View file @ 56f2178
... ... @@ -161,21 +161,9 @@
161 161 .remove = __devexit_p(vt586b_remove),
162 162 };
163 163  
164   -static int __init i2c_vt586b_init(void)
165   -{
166   - return pci_register_driver(&vt586b_driver);
167   -}
  164 +module_pci_driver(vt586b_driver);
168 165  
169   -static void __exit i2c_vt586b_exit(void)
170   -{
171   - pci_unregister_driver(&vt586b_driver);
172   -}
173   -
174   -
175 166 MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>");
176 167 MODULE_DESCRIPTION("i2c for Via vt82c586b southbridge");
177 168 MODULE_LICENSE("GPL");
178   -
179   -module_init(i2c_vt586b_init);
180   -module_exit(i2c_vt586b_exit);