From: Bill Pemberton Date: Mon, 19 Nov 2012 18:26:05 +0000 (-0500) Subject: pcmcia: remove use of __devexit X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e765a02cb64bfef53f290122ca0897ef329a4e76;p=linux-beck.git pcmcia: remove use of __devexit CONFIG_HOTPLUG is going away as an option so __devexit is no longer needed. Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c index 7d2167995821..0c6aac1232fc 100644 --- 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 dc1007392d56..ed3b522601b3 100644 --- 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 aaded4fff4c0..a31e69ea99f3 100644 --- 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 1fe3d88ee566..a007321ad314 100644 --- 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 26832de5f12c..3578e1ca97a0 100644 --- 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 4bb8426afe6d..b29d97e170ae 100644 --- 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 4c38a04d4356..430a9ac56091 100644 --- 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 cb69f61f11ba..65b02c3e14ce 100644 --- 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 287d73be203c..75806be344e5 100644 --- 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 fa17e38c194d..d92692056e24 100644 --- 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 86a89c732825..95f5b270ad44 100644 --- 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 caa92cc7a428..6b4ff099fb13 100644 --- 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);