Commit 5d95f8e2dd263f3e05ae4bf9a3309552363e13af
Committed by
Dominik Brodowski
Dominik Brodowski
1 parent
d571c79e86
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
pcmcia: convert drivers/pcmcia/* to use module_platform_driver()
This patch converts the drivers in drivers/pcmcia/* to use the module_platform_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> Acked-by: Olof Johansson <olof@lixom.net> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Marc Zyngier <maz@misterjones.org> [for the viper part] Acked-by: Manuel Lauss <manuel.lauss@googlemail.com> [for the db1xxx_ss.c part] Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Showing 6 changed files with 6 additions and 71 deletions Side-by-side Diff
drivers/pcmcia/bfin_cf_pcmcia.c
| ... | ... | @@ -310,18 +310,7 @@ |
| 310 | 310 | .remove = __devexit_p(bfin_cf_remove), |
| 311 | 311 | }; |
| 312 | 312 | |
| 313 | -static int __init bfin_cf_init(void) | |
| 314 | -{ | |
| 315 | - return platform_driver_register(&bfin_cf_driver); | |
| 316 | -} | |
| 317 | - | |
| 318 | -static void __exit bfin_cf_exit(void) | |
| 319 | -{ | |
| 320 | - platform_driver_unregister(&bfin_cf_driver); | |
| 321 | -} | |
| 322 | - | |
| 323 | -module_init(bfin_cf_init); | |
| 324 | -module_exit(bfin_cf_exit); | |
| 313 | +module_platform_driver(bfin_cf_driver); | |
| 325 | 314 | |
| 326 | 315 | MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>"); |
| 327 | 316 | MODULE_DESCRIPTION("BFIN CF/PCMCIA Driver"); |
drivers/pcmcia/db1xxx_ss.c
| ... | ... | @@ -580,18 +580,7 @@ |
| 580 | 580 | .remove = __devexit_p(db1x_pcmcia_socket_remove), |
| 581 | 581 | }; |
| 582 | 582 | |
| 583 | -int __init db1x_pcmcia_socket_load(void) | |
| 584 | -{ | |
| 585 | - return platform_driver_register(&db1x_pcmcia_socket_driver); | |
| 586 | -} | |
| 587 | - | |
| 588 | -void __exit db1x_pcmcia_socket_unload(void) | |
| 589 | -{ | |
| 590 | - platform_driver_unregister(&db1x_pcmcia_socket_driver); | |
| 591 | -} | |
| 592 | - | |
| 593 | -module_init(db1x_pcmcia_socket_load); | |
| 594 | -module_exit(db1x_pcmcia_socket_unload); | |
| 583 | +module_platform_driver(db1x_pcmcia_socket_driver); | |
| 595 | 584 | |
| 596 | 585 | MODULE_LICENSE("GPL"); |
| 597 | 586 | MODULE_DESCRIPTION("PCMCIA Socket Services for Alchemy Db/Pb1x00 boards"); |
drivers/pcmcia/electra_cf.c
| ... | ... | @@ -365,17 +365,7 @@ |
| 365 | 365 | .remove = electra_cf_remove, |
| 366 | 366 | }; |
| 367 | 367 | |
| 368 | -static int __init electra_cf_init(void) | |
| 369 | -{ | |
| 370 | - return platform_driver_register(&electra_cf_driver); | |
| 371 | -} | |
| 372 | -module_init(electra_cf_init); | |
| 373 | - | |
| 374 | -static void __exit electra_cf_exit(void) | |
| 375 | -{ | |
| 376 | - platform_driver_unregister(&electra_cf_driver); | |
| 377 | -} | |
| 378 | -module_exit(electra_cf_exit); | |
| 368 | +module_platform_driver(electra_cf_driver); | |
| 379 | 369 | |
| 380 | 370 | MODULE_LICENSE("GPL"); |
| 381 | 371 | MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>"); |
drivers/pcmcia/m8xx_pcmcia.c
| ... | ... | @@ -1304,16 +1304,5 @@ |
| 1304 | 1304 | .remove = m8xx_remove, |
| 1305 | 1305 | }; |
| 1306 | 1306 | |
| 1307 | -static int __init m8xx_init(void) | |
| 1308 | -{ | |
| 1309 | - return platform_driver_register(&m8xx_pcmcia_driver); | |
| 1310 | -} | |
| 1311 | - | |
| 1312 | -static void __exit m8xx_exit(void) | |
| 1313 | -{ | |
| 1314 | - platform_driver_unregister(&m8xx_pcmcia_driver); | |
| 1315 | -} | |
| 1316 | - | |
| 1317 | -module_init(m8xx_init); | |
| 1318 | -module_exit(m8xx_exit); | |
| 1307 | +module_platform_driver(m8xx_pcmcia_driver); |
drivers/pcmcia/pxa2xx_viper.c
| ... | ... | @@ -204,18 +204,7 @@ |
| 204 | 204 | .id_table = viper_pcmcia_id_table, |
| 205 | 205 | }; |
| 206 | 206 | |
| 207 | -static int __init viper_pcmcia_init(void) | |
| 208 | -{ | |
| 209 | - return platform_driver_register(&viper_pcmcia_driver); | |
| 210 | -} | |
| 211 | - | |
| 212 | -static void __exit viper_pcmcia_exit(void) | |
| 213 | -{ | |
| 214 | - return platform_driver_unregister(&viper_pcmcia_driver); | |
| 215 | -} | |
| 216 | - | |
| 217 | -module_init(viper_pcmcia_init); | |
| 218 | -module_exit(viper_pcmcia_exit); | |
| 207 | +module_platform_driver(viper_pcmcia_driver); | |
| 219 | 208 | |
| 220 | 209 | MODULE_DEVICE_TABLE(platform, viper_pcmcia_id_table); |
| 221 | 210 | MODULE_LICENSE("GPL"); |
drivers/pcmcia/xxs1500_ss.c
| ... | ... | @@ -321,18 +321,7 @@ |
| 321 | 321 | .remove = __devexit_p(xxs1500_pcmcia_remove), |
| 322 | 322 | }; |
| 323 | 323 | |
| 324 | -int __init xxs1500_pcmcia_socket_load(void) | |
| 325 | -{ | |
| 326 | - return platform_driver_register(&xxs1500_pcmcia_socket_driver); | |
| 327 | -} | |
| 328 | - | |
| 329 | -void __exit xxs1500_pcmcia_socket_unload(void) | |
| 330 | -{ | |
| 331 | - platform_driver_unregister(&xxs1500_pcmcia_socket_driver); | |
| 332 | -} | |
| 333 | - | |
| 334 | -module_init(xxs1500_pcmcia_socket_load); | |
| 335 | -module_exit(xxs1500_pcmcia_socket_unload); | |
| 324 | +module_platform_driver(xxs1500_pcmcia_socket_driver); | |
| 336 | 325 | |
| 337 | 326 | MODULE_LICENSE("GPL"); |
| 338 | 327 | MODULE_DESCRIPTION("PCMCIA Socket Services for MyCable XXS1500 systems"); |