diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 22:20:38 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-29 00:10:16 +0400 |
commit | 96364e3a5cf1416c158a276134d9a4fc861548c2 (patch) | |
tree | 98170aa6b3ff2e6d34bf5fdcaa26359791a3a61d | |
parent | 13ee2b943c366fc899c860b1aef1c8a2b7a0e546 (diff) | |
download | linux-96364e3a5cf1416c158a276134d9a4fc861548c2.tar.xz |
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>
-rw-r--r-- | drivers/pcmcia/bcm63xx_pcmcia.c | 4 | ||||
-rw-r--r-- | drivers/pcmcia/bfin_cf_pcmcia.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/db1xxx_ss.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/i82092.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/pd6729.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/rsrc_nonstatic.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/sa1111_generic.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/xxs1500_ss.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/yenta_socket.c | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c index c2e997a570bf..57d1053d5bfa 100644 --- a/drivers/pcmcia/bcm63xx_pcmcia.c +++ b/drivers/pcmcia/bcm63xx_pcmcia.c @@ -453,7 +453,7 @@ static int __devexit bcm63xx_drv_pcmcia_remove(struct platform_device *pdev) struct platform_driver bcm63xx_pcmcia_driver = { .probe = bcm63xx_drv_pcmcia_probe, - .remove = __devexit_p(bcm63xx_drv_pcmcia_remove), + .remove = bcm63xx_drv_pcmcia_remove, .driver = { .name = "bcm63xx_pcmcia", .owner = THIS_MODULE, @@ -503,7 +503,7 @@ static struct pci_driver bcm63xx_cardbus_driver = { .name = "bcm63xx_cardbus", .id_table = bcm63xx_cb_table, .probe = bcm63xx_cb_probe, - .remove = __devexit_p(bcm63xx_cb_exit), + .remove = bcm63xx_cb_exit, }; #endif diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c index ac1a2232eab9..2f4bd2751c7a 100644 --- a/drivers/pcmcia/bfin_cf_pcmcia.c +++ b/drivers/pcmcia/bfin_cf_pcmcia.c @@ -307,7 +307,7 @@ static struct platform_driver bfin_cf_driver = { .owner = THIS_MODULE, }, .probe = bfin_cf_probe, - .remove = __devexit_p(bfin_cf_remove), + .remove = bfin_cf_remove, }; module_platform_driver(bfin_cf_driver); diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c index a484b1fb3382..bbbf6f6c1dfc 100644 --- a/drivers/pcmcia/db1xxx_ss.c +++ b/drivers/pcmcia/db1xxx_ss.c @@ -577,7 +577,7 @@ static struct platform_driver db1x_pcmcia_socket_driver = { .owner = THIS_MODULE, }, .probe = db1x_pcmcia_socket_probe, - .remove = __devexit_p(db1x_pcmcia_socket_remove), + .remove = db1x_pcmcia_socket_remove, }; module_platform_driver(db1x_pcmcia_socket_driver); diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c index 4e8831bdb6ef..3f6110008e9b 100644 --- a/drivers/pcmcia/i82092.c +++ b/drivers/pcmcia/i82092.c @@ -35,7 +35,7 @@ static struct pci_driver i82092aa_pci_driver = { .name = "i82092aa", .id_table = i82092aa_pci_ids, .probe = i82092aa_pci_probe, - .remove = __devexit_p(i82092aa_pci_remove), + .remove = i82092aa_pci_remove, }; diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index 253e3867dec7..aa79c0cc6dcf 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c @@ -772,7 +772,7 @@ static struct pci_driver pd6729_pci_driver = { .name = "pd6729", .id_table = pd6729_pci_ids, .probe = pd6729_pci_probe, - .remove = __devexit_p(pd6729_pci_remove), + .remove = pd6729_pci_remove, }; static int pd6729_module_init(void) diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index 9da9656242af..fcf4152689b5 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c @@ -1222,7 +1222,7 @@ static void __devexit pccard_sysfs_remove_rsrc(struct device *dev, static struct class_interface pccard_rsrc_interface __refdata = { .class = &pcmcia_socket_class, .add_dev = &pccard_sysfs_add_rsrc, - .remove_dev = __devexit_p(&pccard_sysfs_remove_rsrc), + .remove_dev = &pccard_sysfs_remove_rsrc, }; static int __init nonstatic_sysfs_init(void) diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index 70f728ce1856..cb69f61f11ba 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c @@ -234,7 +234,7 @@ static struct sa1111_driver pcmcia_driver = { }, .devid = SA1111_DEVID_PCMCIA, .probe = pcmcia_probe, - .remove = __devexit_p(pcmcia_remove), + .remove = pcmcia_remove, }; static int __init sa1111_drv_pcmcia_init(void) diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c index fd5fbd10aad0..86fa3dfc8bf9 100644 --- a/drivers/pcmcia/xxs1500_ss.c +++ b/drivers/pcmcia/xxs1500_ss.c @@ -317,7 +317,7 @@ static struct platform_driver xxs1500_pcmcia_socket_driver = { .owner = THIS_MODULE, }, .probe = xxs1500_pcmcia_probe, - .remove = __devexit_p(xxs1500_pcmcia_remove), + .remove = xxs1500_pcmcia_remove, }; module_platform_driver(xxs1500_pcmcia_socket_driver); diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 667678db1153..407f403800ea 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c @@ -1435,7 +1435,7 @@ static struct pci_driver yenta_cardbus_driver = { .name = "yenta_cardbus", .id_table = yenta_table, .probe = yenta_probe, - .remove = __devexit_p(yenta_close), + .remove = yenta_close, .driver.pm = YENTA_PM_OPS, }; |