pcmcia: remove use of __devexit

CONFIG_HOTPLUG is going away as an option so __devexit 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 7d2167995821c0cdc465f25963e371c9cac5a01d..0c6aac1232fc3943b46837f613b6652fa0acb87b 100644 (file)
--- a/drivers/pcmcia/bcm63xx_pcmcia.c
+++ b/drivers/pcmcia/bcm63xx_pcmcia.c
@@ -436,7 +436,7 @@ err:
        return ret;
 }
 
-static int __devexit bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)
+static int bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)
 {
        struct bcm63xx_pcmcia_socket *skt;
        struct resource *res;
@@ -469,7 +469,7 @@ static int bcm63xx_cb_probe(struct pci_dev *dev,
        return platform_driver_register(&bcm63xx_pcmcia_driver);
 }
 
-static void __devexit bcm63xx_cb_exit(struct pci_dev *dev)
+static void bcm63xx_cb_exit(struct pci_dev *dev)
 {
        platform_driver_unregister(&bcm63xx_pcmcia_driver);
        bcm63xx_cb_dev = NULL;

diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c
index dc1007392d56443876a35d0fac57c63735a9894f..ed3b522601b3a422af5eeea61e25671577116c73 100644 (file)
--- a/drivers/pcmcia/bfin_cf_pcmcia.c
+++ b/drivers/pcmcia/bfin_cf_pcmcia.c
@@ -286,7 +286,7 @@ fail0:
        return status;
 }
 
-static int __devexit bfin_cf_remove(struct platform_device *pdev)
+static int bfin_cf_remove(struct platform_device *pdev)
 {
        struct bfin_cf_socket *cf = platform_get_drvdata(pdev);
 

diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c
index aaded4fff4c0ad07a609c8354922400277e84526..a31e69ea99f367ed7fb46e312c0290acecbc5d65 100644 (file)
--- a/drivers/pcmcia/db1xxx_ss.c
+++ b/drivers/pcmcia/db1xxx_ss.c
@@ -559,7 +559,7 @@ out0:
        return ret;
 }
 
-static int __devexit db1x_pcmcia_socket_remove(struct platform_device *pdev)
+static int db1x_pcmcia_socket_remove(struct platform_device *pdev)
 {
        struct db1x_pcmcia_sock *sock = platform_get_drvdata(pdev);
 

diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index 1fe3d88ee5667c1106a2bad21336bccafa3df6e3..a007321ad3145d3cbeda0defe22d8a713c23a11a 100644 (file)
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -324,7 +324,7 @@ fail1:
 
 }
 
-static int __devexit electra_cf_remove(struct platform_device *ofdev)
+static int electra_cf_remove(struct platform_device *ofdev)
 {
        struct device *device = &ofdev->dev;
        struct electra_cf_socket *cf;

diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index 26832de5f12cd67645a8aa1c2e337759c5e9f8e4..3578e1ca97a0027c70dc50d3b8c58613c334d122 100644 (file)
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -162,7 +162,7 @@ err_out_disable:
        return ret;                     
 }
 
-static void __devexit i82092aa_pci_remove(struct pci_dev *dev)
+static void i82092aa_pci_remove(struct pci_dev *dev)
 {
        struct pcmcia_socket *socket = pci_get_drvdata(dev);
 

diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index 4bb8426afe6d8a4143ba16304dcfd7157d2a68e0..b29d97e170aee91d2f0030d8947683d0c280cab7 100644 (file)
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -739,7 +739,7 @@ err_out_free_mem:
        return ret;
 }
 
-static void __devexit pd6729_pci_remove(struct pci_dev *dev)
+static void pd6729_pci_remove(struct pci_dev *dev)
 {
        int i;
        struct pd6729_socket *socket = pci_get_drvdata(dev);

diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index 4c38a04d4356ab61c7b40e92844aee95bf3affd9..430a9ac56091ec5c8226708a7735ae099a3c016c 100644 (file)
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -1209,7 +1209,7 @@ static int pccard_sysfs_add_rsrc(struct device *dev,
        return sysfs_create_group(&dev->kobj, &rsrc_attributes);
 }
 
-static void __devexit pccard_sysfs_remove_rsrc(struct device *dev,
+static void pccard_sysfs_remove_rsrc(struct device *dev,
                                               struct class_interface *class_intf)
 {
        struct pcmcia_socket *s = dev_get_drvdata(dev);

diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index cb69f61f11ba8653896c572021cbdf1ad1b41aa5..65b02c3e14cefa911580ae2283991cfd1956f875 100644 (file)
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -211,7 +211,7 @@ static int pcmcia_probe(struct sa1111_dev *dev)
        return 0;
 }
 
-static int __devexit pcmcia_remove(struct sa1111_dev *dev)
+static int pcmcia_remove(struct sa1111_dev *dev)
 {
        struct sa1111_pcmcia_socket *next, *s = dev_get_drvdata(&dev->dev);
 

diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c
index 287d73be203cc2a4d7c95c4c9a03cf554f919fad..75806be344e59b96b2675892006601c188b1983b 100644 (file)
--- a/drivers/pcmcia/vrc4171_card.c
+++ b/drivers/pcmcia/vrc4171_card.c
@@ -746,7 +746,7 @@ static int vrc4171_card_init(void)
        return 0;
 }
 
-static void __devexit vrc4171_card_exit(void)
+static void vrc4171_card_exit(void)
 {
        free_irq(vrc4171_irq, vrc4171_sockets);
        vrc4171_remove_sockets();

diff --git a/drivers/pcmcia/vrc4173_cardu.c b/drivers/pcmcia/vrc4173_cardu.c
index fa17e38c194d8c515affe2c7ea01f9ea6f8397e2..d92692056e2498241f3d62ac1d45c7a19311a522 100644 (file)
--- a/drivers/pcmcia/vrc4173_cardu.c
+++ b/drivers/pcmcia/vrc4173_cardu.c
@@ -581,7 +581,7 @@ static int vrc4173_cardu_init(void)
        return pci_register_driver(&vrc4173_cardu_driver);
 }
 
-static void __devexit vrc4173_cardu_exit(void)
+static void vrc4173_cardu_exit(void)
 {
        pci_unregister_driver(&vrc4173_cardu_driver);
 }

diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c
index 86a89c732825971f438ebe54123a055a3619a88f..95f5b270ad440783bb7916e5005323ca0e211844 100644 (file)
--- a/drivers/pcmcia/xxs1500_ss.c
+++ b/drivers/pcmcia/xxs1500_ss.c
@@ -299,7 +299,7 @@ out0:
        return ret;
 }
 
-static int __devexit xxs1500_pcmcia_remove(struct platform_device *pdev)
+static int xxs1500_pcmcia_remove(struct platform_device *pdev)
 {
        struct xxs1500_pcmcia_sock *sock = platform_get_drvdata(pdev);
 

diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index caa92cc7a428c2668fe6da5fafc590c32f43c8c6..6b4ff099fb13c8de403f20e1920c002787c8a81d 100644 (file)
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -783,7 +783,7 @@ static void yenta_free_resources(struct yenta_socket *socket)
 /*
  * Close it down - release our resources and go home..
  */
-static void __devexit yenta_close(struct pci_dev *dev)
+static void yenta_close(struct pci_dev *dev)
 {
        struct yenta_socket *sock = pci_get_drvdata(dev);