Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 300bac7fb85a20b2704dc3645419057992f78565

Authored by Axel Lin
Committed by Anton Vorontsov
1 parent 251f39fe42
Exists in master and in 6 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, smarc-l5.0.0_1.0.0-ga

power_supply: Convert drivers/power/* to use module_platform_driver() 

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

Cc: Mike Rapoport <mike@compulab.co.il>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Nithish Mahalingam <nithish.mahalingam@intel.com>
Cc: MyungJoo Ham <myungjoo.ham@samsung.com>
Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: Balaji Rao <balajirrao@openmoko.org>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Clifton Barnes <cabarnes@indesign-llc.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>

Showing 19 changed files with 21 additions and 219 deletions Side-by-side Diff

drivers/power/da9030_battery.c
Diff comments   View file @ 300bac7
... ... @@ -588,18 +588,7 @@
588 588 .remove = da9030_battery_remove,
589 589 };
590 590  
591   -static int da903x_battery_init(void)
592   -{
593   - return platform_driver_register(&da903x_battery_driver);
594   -}
595   -
596   -static void da903x_battery_exit(void)
597   -{
598   - platform_driver_unregister(&da903x_battery_driver);
599   -}
600   -
601   -module_init(da903x_battery_init);
602   -module_exit(da903x_battery_exit);
  591 +module_platform_driver(da903x_battery_driver);
603 592  
604 593 MODULE_DESCRIPTION("DA9030 battery charger driver");
605 594 MODULE_AUTHOR("Mike Rapoport, CompuLab");
drivers/power/ds2760_battery.c
Diff comments   View file @ 300bac7
... ... @@ -641,18 +641,7 @@
641 641 .resume = ds2760_battery_resume,
642 642 };
643 643  
644   -static int __init ds2760_battery_init(void)
645   -{
646   - return platform_driver_register(&ds2760_battery_driver);
647   -}
648   -
649   -static void __exit ds2760_battery_exit(void)
650   -{
651   - platform_driver_unregister(&ds2760_battery_driver);
652   -}
653   -
654   -module_init(ds2760_battery_init);
655   -module_exit(ds2760_battery_exit);
  644 +module_platform_driver(ds2760_battery_driver);
656 645  
657 646 MODULE_LICENSE("GPL");
658 647 MODULE_AUTHOR("Szabolcs Gyurko <szabolcs.gyurko@tlt.hu>, "
drivers/power/ds2780_battery.c
Diff comments   View file @ 300bac7
... ... @@ -841,8 +841,6 @@
841 841 return 0;
842 842 }
843 843  
844   -MODULE_ALIAS("platform:ds2780-battery");
845   -
846 844 static struct platform_driver ds2780_battery_driver = {
847 845 .driver = {
848 846 .name = "ds2780-battery",
849 847  
850 848  
... ... @@ -851,20 +849,10 @@
851 849 .remove = __devexit_p(ds2780_battery_remove),
852 850 };
853 851  
854   -static int __init ds2780_battery_init(void)
855   -{
856   - return platform_driver_register(&ds2780_battery_driver);
857   -}
  852 +module_platform_driver(ds2780_battery_driver);
858 853  
859   -static void __exit ds2780_battery_exit(void)
860   -{
861   - platform_driver_unregister(&ds2780_battery_driver);
862   -}
863   -
864   -module_init(ds2780_battery_init);
865   -module_exit(ds2780_battery_exit);
866   -
867 854 MODULE_LICENSE("GPL");
868 855 MODULE_AUTHOR("Clifton Barnes <cabarnes@indesign-llc.com>");
869 856 MODULE_DESCRIPTION("Maxim/Dallas DS2780 Stand-Alone Fuel Gauage IC driver");
  857 +MODULE_ALIAS("platform:ds2780-battery");
drivers/power/gpio-charger.c
Diff comments   View file @ 300bac7
... ... @@ -185,17 +185,7 @@
185 185 },
186 186 };
187 187  
188   -static int __init gpio_charger_init(void)
189   -{
190   - return platform_driver_register(&gpio_charger_driver);
191   -}
192   -module_init(gpio_charger_init);
193   -
194   -static void __exit gpio_charger_exit(void)
195   -{
196   - platform_driver_unregister(&gpio_charger_driver);
197   -}
198   -module_exit(gpio_charger_exit);
  188 +module_platform_driver(gpio_charger_driver);
199 189  
200 190 MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
201 191 MODULE_DESCRIPTION("Driver for chargers which report their online status through a GPIO");
drivers/power/intel_mid_battery.c
Diff comments   View file @ 300bac7
... ... @@ -779,18 +779,7 @@
779 779 .remove = __devexit_p(platform_pmic_battery_remove),
780 780 };
781 781  
782   -static int __init platform_pmic_battery_module_init(void)
783   -{
784   - return platform_driver_register(&platform_pmic_battery_driver);
785   -}
786   -
787   -static void __exit platform_pmic_battery_module_exit(void)
788   -{
789   - platform_driver_unregister(&platform_pmic_battery_driver);
790   -}
791   -
792   -module_init(platform_pmic_battery_module_init);
793   -module_exit(platform_pmic_battery_module_exit);
  782 +module_platform_driver(platform_pmic_battery_driver);
794 783  
795 784 MODULE_AUTHOR("Nithish Mahalingam <nithish.mahalingam@intel.com>");
796 785 MODULE_DESCRIPTION("Intel Moorestown PMIC Battery Driver");
drivers/power/isp1704_charger.c
Diff comments   View file @ 300bac7
... ... @@ -494,17 +494,7 @@
494 494 .remove = __devexit_p(isp1704_charger_remove),
495 495 };
496 496  
497   -static int __init isp1704_charger_init(void)
498   -{
499   - return platform_driver_register(&isp1704_charger_driver);
500   -}
501   -module_init(isp1704_charger_init);
502   -
503   -static void __exit isp1704_charger_exit(void)
504   -{
505   - platform_driver_unregister(&isp1704_charger_driver);
506   -}
507   -module_exit(isp1704_charger_exit);
  497 +module_platform_driver(isp1704_charger_driver);
508 498  
509 499 MODULE_ALIAS("platform:isp1704_charger");
510 500 MODULE_AUTHOR("Nokia Corporation");
drivers/power/jz4740-battery.c
Diff comments   View file @ 300bac7
... ... @@ -441,17 +441,7 @@
441 441 },
442 442 };
443 443  
444   -static int __init jz_battery_init(void)
445   -{
446   - return platform_driver_register(&jz_battery_driver);
447   -}
448   -module_init(jz_battery_init);
449   -
450   -static void __exit jz_battery_exit(void)
451   -{
452   - platform_driver_unregister(&jz_battery_driver);
453   -}
454   -module_exit(jz_battery_exit);
  444 +module_platform_driver(jz_battery_driver);
455 445  
456 446 MODULE_ALIAS("platform:jz4740-battery");
457 447 MODULE_LICENSE("GPL");
drivers/power/max8903_charger.c
Diff comments   View file @ 300bac7
... ... @@ -374,17 +374,7 @@
374 374 },
375 375 };
376 376  
377   -static int __init max8903_init(void)
378   -{
379   - return platform_driver_register(&max8903_driver);
380   -}
381   -module_init(max8903_init);
382   -
383   -static void __exit max8903_exit(void)
384   -{
385   - platform_driver_unregister(&max8903_driver);
386   -}
387   -module_exit(max8903_exit);
  377 +module_platform_driver(max8903_driver);
388 378  
389 379 MODULE_LICENSE("GPL");
390 380 MODULE_DESCRIPTION("MAX8903 Charger Driver");
drivers/power/max8925_power.c
Diff comments   View file @ 300bac7
... ... @@ -523,17 +523,7 @@
523 523 },
524 524 };
525 525  
526   -static int __init max8925_power_init(void)
527   -{
528   - return platform_driver_register(&max8925_power_driver);
529   -}
530   -module_init(max8925_power_init);
531   -
532   -static void __exit max8925_power_exit(void)
533   -{
534   - platform_driver_unregister(&max8925_power_driver);
535   -}
536   -module_exit(max8925_power_exit);
  526 +module_platform_driver(max8925_power_driver);
537 527  
538 528 MODULE_LICENSE("GPL");
539 529 MODULE_DESCRIPTION("Power supply driver for MAX8925");
drivers/power/max8998_charger.c
Diff comments   View file @ 300bac7
... ... @@ -204,17 +204,7 @@
204 204 .id_table = max8998_battery_id,
205 205 };
206 206  
207   -static int __init max8998_battery_init(void)
208   -{
209   - return platform_driver_register(&max8998_battery_driver);
210   -}
211   -module_init(max8998_battery_init);
212   -
213   -static void __exit max8998_battery_cleanup(void)
214   -{
215   - platform_driver_unregister(&max8998_battery_driver);
216   -}
217   -module_exit(max8998_battery_cleanup);
  207 +module_platform_driver(max8998_battery_driver);
218 208  
219 209 MODULE_DESCRIPTION("MAXIM 8998 battery control driver");
220 210 MODULE_AUTHOR("MyungJoo Ham <myungjoo.ham@samsung.com>");
drivers/power/olpc_battery.c
Diff comments   View file @ 300bac7
... ... @@ -630,17 +630,7 @@
630 630 .suspend = olpc_battery_suspend,
631 631 };
632 632  
633   -static int __init olpc_bat_init(void)
634   -{
635   - return platform_driver_register(&olpc_battery_driver);
636   -}
637   -module_init(olpc_bat_init);
638   -
639   -static void __exit olpc_bat_exit(void)
640   -{
641   - platform_driver_unregister(&olpc_battery_driver);
642   -}
643   -module_exit(olpc_bat_exit);
  633 +module_platform_driver(olpc_battery_driver);
644 634  
645 635 MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
646 636 MODULE_LICENSE("GPL");
drivers/power/pcf50633-charger.c
Diff comments   View file @ 300bac7
... ... @@ -474,17 +474,7 @@
474 474 .remove = __devexit_p(pcf50633_mbc_remove),
475 475 };
476 476  
477   -static int __init pcf50633_mbc_init(void)
478   -{
479   - return platform_driver_register(&pcf50633_mbc_driver);
480   -}
481   -module_init(pcf50633_mbc_init);
482   -
483   -static void __exit pcf50633_mbc_exit(void)
484   -{
485   - platform_driver_unregister(&pcf50633_mbc_driver);
486   -}
487   -module_exit(pcf50633_mbc_exit);
  477 +module_platform_driver(pcf50633_mbc_driver);
488 478  
489 479 MODULE_AUTHOR("Balaji Rao <balajirrao@openmoko.org>");
490 480 MODULE_DESCRIPTION("PCF50633 mbc driver");
drivers/power/pda_power.c
Diff comments   View file @ 300bac7
... ... @@ -498,8 +498,6 @@
498 498 #define pda_power_resume NULL
499 499 #endif /* CONFIG_PM */
500 500  
501   -MODULE_ALIAS("platform:pda-power");
502   -
503 501 static struct platform_driver pda_power_pdrv = {
504 502 .driver = {
505 503 .name = "pda-power",
506 504  
507 505  
... ... @@ -510,18 +508,9 @@
510 508 .resume = pda_power_resume,
511 509 };
512 510  
513   -static int __init pda_power_init(void)
514   -{
515   - return platform_driver_register(&pda_power_pdrv);
516   -}
  511 +module_platform_driver(pda_power_pdrv);
517 512  
518   -static void __exit pda_power_exit(void)
519   -{
520   - platform_driver_unregister(&pda_power_pdrv);
521   -}
522   -
523   -module_init(pda_power_init);
524   -module_exit(pda_power_exit);
525 513 MODULE_LICENSE("GPL");
526 514 MODULE_AUTHOR("Anton Vorontsov <cbou@mail.ru>");
  515 +MODULE_ALIAS("platform:pda-power");
drivers/power/s3c_adc_battery.c
Diff comments   View file @ 300bac7
... ... @@ -421,17 +421,7 @@
421 421 .resume = s3c_adc_bat_resume,
422 422 };
423 423  
424   -static int __init s3c_adc_bat_init(void)
425   -{
426   - return platform_driver_register(&s3c_adc_bat_driver);
427   -}
428   -module_init(s3c_adc_bat_init);
429   -
430   -static void __exit s3c_adc_bat_exit(void)
431   -{
432   - platform_driver_unregister(&s3c_adc_bat_driver);
433   -}
434   -module_exit(s3c_adc_bat_exit);
  424 +module_platform_driver(s3c_adc_bat_driver);
435 425  
436 426 MODULE_AUTHOR("Vasily Khoruzhick <anarsoul@gmail.com>");
437 427 MODULE_DESCRIPTION("iPAQ H1930/H1940/RX1950 battery controller driver");
drivers/power/tosa_battery.c
Diff comments   View file @ 300bac7
... ... @@ -438,18 +438,7 @@
438 438 .resume = tosa_bat_resume,
439 439 };
440 440  
441   -static int __init tosa_bat_init(void)
442   -{
443   - return platform_driver_register(&tosa_bat_driver);
444   -}
445   -
446   -static void __exit tosa_bat_exit(void)
447   -{
448   - platform_driver_unregister(&tosa_bat_driver);
449   -}
450   -
451   -module_init(tosa_bat_init);
452   -module_exit(tosa_bat_exit);
  441 +module_platform_driver(tosa_bat_driver);
453 442  
454 443 MODULE_LICENSE("GPL");
455 444 MODULE_AUTHOR("Dmitry Baryshkov");
drivers/power/wm831x_backup.c
Diff comments   View file @ 300bac7
... ... @@ -226,17 +226,7 @@
226 226 },
227 227 };
228 228  
229   -static int __init wm831x_backup_init(void)
230   -{
231   - return platform_driver_register(&wm831x_backup_driver);
232   -}
233   -module_init(wm831x_backup_init);
234   -
235   -static void __exit wm831x_backup_exit(void)
236   -{
237   - platform_driver_unregister(&wm831x_backup_driver);
238   -}
239   -module_exit(wm831x_backup_exit);
  229 +module_platform_driver(wm831x_backup_driver);
240 230  
241 231 MODULE_DESCRIPTION("Backup battery charger driver for WM831x PMICs");
242 232 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
drivers/power/wm831x_power.c
Diff comments   View file @ 300bac7
... ... @@ -655,17 +655,7 @@
655 655 },
656 656 };
657 657  
658   -static int __init wm831x_power_init(void)
659   -{
660   - return platform_driver_register(&wm831x_power_driver);
661   -}
662   -module_init(wm831x_power_init);
663   -
664   -static void __exit wm831x_power_exit(void)
665   -{
666   - platform_driver_unregister(&wm831x_power_driver);
667   -}
668   -module_exit(wm831x_power_exit);
  658 +module_platform_driver(wm831x_power_driver);
669 659  
670 660 MODULE_DESCRIPTION("Power supply driver for WM831x PMICs");
671 661 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
drivers/power/wm8350_power.c
Diff comments   View file @ 300bac7
... ... @@ -522,17 +522,7 @@
522 522 },
523 523 };
524 524  
525   -static int __init wm8350_power_init(void)
526   -{
527   - return platform_driver_register(&wm8350_power_driver);
528   -}
529   -module_init(wm8350_power_init);
530   -
531   -static void __exit wm8350_power_exit(void)
532   -{
533   - platform_driver_unregister(&wm8350_power_driver);
534   -}
535   -module_exit(wm8350_power_exit);
  525 +module_platform_driver(wm8350_power_driver);
536 526  
537 527 MODULE_LICENSE("GPL");
538 528 MODULE_DESCRIPTION("Power supply driver for WM8350");
drivers/power/wm97xx_battery.c
Diff comments   View file @ 300bac7
... ... @@ -291,18 +291,7 @@
291 291 .remove = __devexit_p(wm97xx_bat_remove),
292 292 };
293 293  
294   -static int __init wm97xx_bat_init(void)
295   -{
296   - return platform_driver_register(&wm97xx_bat_driver);
297   -}
298   -
299   -static void __exit wm97xx_bat_exit(void)
300   -{
301   - platform_driver_unregister(&wm97xx_bat_driver);
302   -}
303   -
304   -module_init(wm97xx_bat_init);
305   -module_exit(wm97xx_bat_exit);
  294 +module_platform_driver(wm97xx_bat_driver);
306 295  
307 296 MODULE_LICENSE("GPL");
308 297 MODULE_AUTHOR("Marek Vasut <marek.vasut@gmail.com>");