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>

diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c
index c2e997a570bffd84bf09392091f8fb44603888ba..57d1053d5bfaa15ffa6218e0216b2c5c266a40d8 100644 (file)
--- 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 ac1a2232eab954e0df850bacbd27eee77e2df584..2f4bd2751c7a1dfec6ac5a96ba6e0ee839bc1398 100644 (file)
--- 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 a484b1fb338288c2756376f31ed8bffd2aaa0997..bbbf6f6c1dfcaa69e80a23f455b0e59f581a2e49 100644 (file)
--- 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 4e8831bdb6efb2af19e4a25114cbc80daabc3bb7..3f6110008e9b19169e9a47eb274ac987b30e0066 100644 (file)
--- 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 253e3867dec713e8d1b5df9167a8da2337cb7465..aa79c0cc6dcf1256a8ff63a97c63f05f057d9b24 100644 (file)
--- 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 9da9656242af8b327d2859169df0acae2a56fd17..fcf4152689b5973b68262c23c66f4023d8474bc9 100644 (file)
--- 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 70f728ce1856b0723e1ff9a51dd8ffb3847a8b19..cb69f61f11ba8653896c572021cbdf1ad1b41aa5 100644 (file)
--- 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 fd5fbd10aad07e853878ff53a3c5280dbc330bdc..86fa3dfc8bf93e284337bf62568f4f5592106075 100644 (file)
--- 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 667678db115311e32125ac77faaf83ceff49b296..407f403800eaa42f33c4ab0971e2024ebcf7af4f 100644 (file)
--- 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,
 };