Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net/wireless: use module_pci_driver

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

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Cc: Nick Kossifidis <mickflemm@gmail.com>
Cc: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
Cc: Simon Kelley <simon@thekelleys.org.uk>
Cc: Jouni Malinen <j@w1.fi>
Cc: Lennert Buytenhek <buytenh@wantstofly.org>
Cc: Christian Lamparter <chunkeey@googlemail.com>
Cc: Ivo van Doorn <IvDoorn@gmail.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: linux-wireless@vger.kernel.org
Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Axel Lin and committed by
John W. Linville
5b0a3b7e 1dae27f8

+13 -191
+1 -16
drivers/net/wireless/adm8211.c
··· 1991 1991 #endif /* CONFIG_PM */ 1992 1992 }; 1993 1993 1994 - 1995 - 1996 - static int __init adm8211_init(void) 1997 - { 1998 - return pci_register_driver(&adm8211_driver); 1999 - } 2000 - 2001 - 2002 - static void __exit adm8211_exit(void) 2003 - { 2004 - pci_unregister_driver(&adm8211_driver); 2005 - } 2006 - 2007 - 2008 - module_init(adm8211_init); 2009 - module_exit(adm8211_exit); 1994 + module_pci_driver(adm8211_driver);
+1 -25
drivers/net/wireless/ath/ath5k/pci.c
··· 340 340 .driver.pm = ATH5K_PM_OPS, 341 341 }; 342 342 343 - /* 344 - * Module init/exit functions 345 - */ 346 - static int __init 347 - init_ath5k_pci(void) 348 - { 349 - int ret; 350 - 351 - ret = pci_register_driver(&ath5k_pci_driver); 352 - if (ret) { 353 - pr_err("pci: can't register pci driver\n"); 354 - return ret; 355 - } 356 - 357 - return 0; 358 - } 359 - 360 - static void __exit 361 - exit_ath5k_pci(void) 362 - { 363 - pci_unregister_driver(&ath5k_pci_driver); 364 - } 365 - 366 - module_init(init_ath5k_pci); 367 - module_exit(exit_ath5k_pci); 343 + module_pci_driver(ath5k_pci_driver);
+1 -12
drivers/net/wireless/atmel_pci.c
··· 74 74 stop_atmel_card(pci_get_drvdata(pdev)); 75 75 } 76 76 77 - static int __init atmel_init_module(void) 78 - { 79 - return pci_register_driver(&atmel_driver); 80 - } 81 - 82 - static void __exit atmel_cleanup_module(void) 83 - { 84 - pci_unregister_driver(&atmel_driver); 85 - } 86 - 87 - module_init(atmel_init_module); 88 - module_exit(atmel_cleanup_module); 77 + module_pci_driver(atmel_driver);
+1 -15
drivers/net/wireless/hostap/hostap_pci.c
··· 457 457 #endif /* CONFIG_PM */ 458 458 }; 459 459 460 - 461 - static int __init init_prism2_pci(void) 462 - { 463 - return pci_register_driver(&prism2_pci_driver); 464 - } 465 - 466 - 467 - static void __exit exit_prism2_pci(void) 468 - { 469 - pci_unregister_driver(&prism2_pci_driver); 470 - } 471 - 472 - 473 - module_init(init_prism2_pci); 474 - module_exit(exit_prism2_pci); 460 + module_pci_driver(prism2_pci_driver);
+1 -15
drivers/net/wireless/hostap/hostap_plx.c
··· 616 616 .remove = prism2_plx_remove, 617 617 }; 618 618 619 - 620 - static int __init init_prism2_plx(void) 621 - { 622 - return pci_register_driver(&prism2_plx_driver); 623 - } 624 - 625 - 626 - static void __exit exit_prism2_plx(void) 627 - { 628 - pci_unregister_driver(&prism2_plx_driver); 629 - } 630 - 631 - 632 - module_init(init_prism2_plx); 633 - module_exit(exit_prism2_plx); 619 + module_pci_driver(prism2_plx_driver);
+1 -12
drivers/net/wireless/mwl8k.c
··· 5893 5893 .shutdown = __devexit_p(mwl8k_shutdown), 5894 5894 }; 5895 5895 5896 - static int __init mwl8k_init(void) 5897 - { 5898 - return pci_register_driver(&mwl8k_driver); 5899 - } 5900 - 5901 - static void __exit mwl8k_exit(void) 5902 - { 5903 - pci_unregister_driver(&mwl8k_driver); 5904 - } 5905 - 5906 - module_init(mwl8k_init); 5907 - module_exit(mwl8k_exit); 5896 + module_pci_driver(mwl8k_driver); 5908 5897 5909 5898 MODULE_DESCRIPTION(MWL8K_DESC); 5910 5899 MODULE_VERSION(MWL8K_VERSION);
+1 -12
drivers/net/wireless/p54/p54pci.c
··· 667 667 .driver.pm = P54P_PM_OPS, 668 668 }; 669 669 670 - static int __init p54p_init(void) 671 - { 672 - return pci_register_driver(&p54p_driver); 673 - } 674 - 675 - static void __exit p54p_exit(void) 676 - { 677 - pci_unregister_driver(&p54p_driver); 678 - } 679 - 680 - module_init(p54p_init); 681 - module_exit(p54p_exit); 670 + module_pci_driver(p54p_driver);
+1 -12
drivers/net/wireless/rt2x00/rt2400pci.c
··· 1828 1828 .resume = rt2x00pci_resume, 1829 1829 }; 1830 1830 1831 - static int __init rt2400pci_init(void) 1832 - { 1833 - return pci_register_driver(&rt2400pci_driver); 1834 - } 1835 - 1836 - static void __exit rt2400pci_exit(void) 1837 - { 1838 - pci_unregister_driver(&rt2400pci_driver); 1839 - } 1840 - 1841 - module_init(rt2400pci_init); 1842 - module_exit(rt2400pci_exit); 1831 + module_pci_driver(rt2400pci_driver);
+1 -12
drivers/net/wireless/rt2x00/rt2500pci.c
··· 2119 2119 .resume = rt2x00pci_resume, 2120 2120 }; 2121 2121 2122 - static int __init rt2500pci_init(void) 2123 - { 2124 - return pci_register_driver(&rt2500pci_driver); 2125 - } 2126 - 2127 - static void __exit rt2500pci_exit(void) 2128 - { 2129 - pci_unregister_driver(&rt2500pci_driver); 2130 - } 2131 - 2132 - module_init(rt2500pci_init); 2133 - module_exit(rt2500pci_exit); 2122 + module_pci_driver(rt2500pci_driver);
+1 -12
drivers/net/wireless/rt2x00/rt61pci.c
··· 3092 3092 .resume = rt2x00pci_resume, 3093 3093 }; 3094 3094 3095 - static int __init rt61pci_init(void) 3096 - { 3097 - return pci_register_driver(&rt61pci_driver); 3098 - } 3099 - 3100 - static void __exit rt61pci_exit(void) 3101 - { 3102 - pci_unregister_driver(&rt61pci_driver); 3103 - } 3104 - 3105 - module_init(rt61pci_init); 3106 - module_exit(rt61pci_exit); 3095 + module_pci_driver(rt61pci_driver);
+1 -12
drivers/net/wireless/rtl818x/rtl8180/dev.c
··· 1173 1173 #endif /* CONFIG_PM */ 1174 1174 }; 1175 1175 1176 - static int __init rtl8180_init(void) 1177 - { 1178 - return pci_register_driver(&rtl8180_driver); 1179 - } 1180 - 1181 - static void __exit rtl8180_exit(void) 1182 - { 1183 - pci_unregister_driver(&rtl8180_driver); 1184 - } 1185 - 1186 - module_init(rtl8180_init); 1187 - module_exit(rtl8180_exit); 1176 + module_pci_driver(rtl8180_driver);
+1 -18
drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
··· 389 389 .driver.pm = &rtlwifi_pm_ops, 390 390 }; 391 391 392 - static int __init rtl92ce_module_init(void) 393 - { 394 - int ret; 395 - 396 - ret = pci_register_driver(&rtl92ce_driver); 397 - if (ret) 398 - RT_ASSERT(false, "No device found\n"); 399 - 400 - return ret; 401 - } 402 - 403 - static void __exit rtl92ce_module_exit(void) 404 - { 405 - pci_unregister_driver(&rtl92ce_driver); 406 - } 407 - 408 - module_init(rtl92ce_module_init); 409 - module_exit(rtl92ce_module_exit); 392 + module_pci_driver(rtl92ce_driver);
+1 -18
drivers/net/wireless/rtlwifi/rtl8192se/sw.c
··· 450 450 .driver.pm = &rtlwifi_pm_ops, 451 451 }; 452 452 453 - static int __init rtl92se_module_init(void) 454 - { 455 - int ret = 0; 456 - 457 - ret = pci_register_driver(&rtl92se_driver); 458 - if (ret) 459 - RT_ASSERT(false, "No device found\n"); 460 - 461 - return ret; 462 - } 463 - 464 - static void __exit rtl92se_module_exit(void) 465 - { 466 - pci_unregister_driver(&rtl92se_driver); 467 - } 468 - 469 - module_init(rtl92se_module_init); 470 - module_exit(rtl92se_module_exit); 453 + module_pci_driver(rtl92se_driver);