Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 96364e3a5cf1416c158a276134d9a4fc861548c2

Authored by Bill Pemberton
Committed by Greg Kroah-Hartman
1 parent 13ee2b943c
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

pcmcia: remove use of __devexit_p 

CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 9 changed files with 10 additions and 10 deletions Side-by-side Diff

drivers/pcmcia/bcm63xx_pcmcia.c
Diff comments   View file @ 96364e3
... ... @@ -453,7 +453,7 @@
453 453  
454 454 struct platform_driver bcm63xx_pcmcia_driver = {
455 455 .probe = bcm63xx_drv_pcmcia_probe,
456   - .remove = __devexit_p(bcm63xx_drv_pcmcia_remove),
  456 + .remove = bcm63xx_drv_pcmcia_remove,
457 457 .driver = {
458 458 .name = "bcm63xx_pcmcia",
459 459 .owner = THIS_MODULE,
... ... @@ -503,7 +503,7 @@
503 503 .name = "bcm63xx_cardbus",
504 504 .id_table = bcm63xx_cb_table,
505 505 .probe = bcm63xx_cb_probe,
506   - .remove = __devexit_p(bcm63xx_cb_exit),
  506 + .remove = bcm63xx_cb_exit,
507 507 };
508 508 #endif
509 509  
drivers/pcmcia/bfin_cf_pcmcia.c
Diff comments   View file @ 96364e3
... ... @@ -307,7 +307,7 @@
307 307 .owner = THIS_MODULE,
308 308 },
309 309 .probe = bfin_cf_probe,
310   - .remove = __devexit_p(bfin_cf_remove),
  310 + .remove = bfin_cf_remove,
311 311 };
312 312  
313 313 module_platform_driver(bfin_cf_driver);
drivers/pcmcia/db1xxx_ss.c
Diff comments   View file @ 96364e3
... ... @@ -577,7 +577,7 @@
577 577 .owner = THIS_MODULE,
578 578 },
579 579 .probe = db1x_pcmcia_socket_probe,
580   - .remove = __devexit_p(db1x_pcmcia_socket_remove),
  580 + .remove = db1x_pcmcia_socket_remove,
581 581 };
582 582  
583 583 module_platform_driver(db1x_pcmcia_socket_driver);
drivers/pcmcia/i82092.c
Diff comments   View file @ 96364e3
... ... @@ -35,7 +35,7 @@
35 35 .name = "i82092aa",
36 36 .id_table = i82092aa_pci_ids,
37 37 .probe = i82092aa_pci_probe,
38   - .remove = __devexit_p(i82092aa_pci_remove),
  38 + .remove = i82092aa_pci_remove,
39 39 };
40 40  
41 41  
drivers/pcmcia/pd6729.c
Diff comments   View file @ 96364e3
... ... @@ -772,7 +772,7 @@
772 772 .name = "pd6729",
773 773 .id_table = pd6729_pci_ids,
774 774 .probe = pd6729_pci_probe,
775   - .remove = __devexit_p(pd6729_pci_remove),
  775 + .remove = pd6729_pci_remove,
776 776 };
777 777  
778 778 static int pd6729_module_init(void)
drivers/pcmcia/rsrc_nonstatic.c
Diff comments   View file @ 96364e3
... ... @@ -1222,7 +1222,7 @@
1222 1222 static struct class_interface pccard_rsrc_interface __refdata = {
1223 1223 .class = &pcmcia_socket_class,
1224 1224 .add_dev = &pccard_sysfs_add_rsrc,
1225   - .remove_dev = __devexit_p(&pccard_sysfs_remove_rsrc),
  1225 + .remove_dev = &pccard_sysfs_remove_rsrc,
1226 1226 };
1227 1227  
1228 1228 static int __init nonstatic_sysfs_init(void)
drivers/pcmcia/sa1111_generic.c
Diff comments   View file @ 96364e3
... ... @@ -234,7 +234,7 @@
234 234 },
235 235 .devid = SA1111_DEVID_PCMCIA,
236 236 .probe = pcmcia_probe,
237   - .remove = __devexit_p(pcmcia_remove),
  237 + .remove = pcmcia_remove,
238 238 };
239 239  
240 240 static int __init sa1111_drv_pcmcia_init(void)
drivers/pcmcia/xxs1500_ss.c
Diff comments   View file @ 96364e3
... ... @@ -317,7 +317,7 @@
317 317 .owner = THIS_MODULE,
318 318 },
319 319 .probe = xxs1500_pcmcia_probe,
320   - .remove = __devexit_p(xxs1500_pcmcia_remove),
  320 + .remove = xxs1500_pcmcia_remove,
321 321 };
322 322  
323 323 module_platform_driver(xxs1500_pcmcia_socket_driver);
drivers/pcmcia/yenta_socket.c
Diff comments   View file @ 96364e3
... ... @@ -1435,7 +1435,7 @@
1435 1435 .name = "yenta_cardbus",
1436 1436 .id_table = yenta_table,
1437 1437 .probe = yenta_probe,
1438   - .remove = __devexit_p(yenta_close),
  1438 + .remove = yenta_close,
1439 1439 .driver.pm = YENTA_PM_OPS,
1440 1440 };
1441 1441