dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Bill Pemberton 2012-11-19 13:26:05 -05:00 committed by Greg Kroah-Hartman
parent 21fb7674c9
commit e765a02cb6
12 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pcmcia/bcm63xx_pcmcia.c
View File

@ -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;

2
drivers/pcmcia/bfin_cf_pcmcia.c
View File

@ -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);

2
drivers/pcmcia/db1xxx_ss.c
View File

@ -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);

2
drivers/pcmcia/electra_cf.c
View File

@ -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;

2
drivers/pcmcia/i82092.c
View File

@ -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);

2
drivers/pcmcia/pd6729.c
View File

@ -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);

2
drivers/pcmcia/rsrc_nonstatic.c
View File

@ -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);

2
drivers/pcmcia/sa1111_generic.c
View File

@ -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);

2
drivers/pcmcia/vrc4171_card.c
View File

@ -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();

2
drivers/pcmcia/vrc4173_cardu.c
View File

@ -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);
}

2
drivers/pcmcia/xxs1500_ss.c
View File

@ -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);

2
drivers/pcmcia/yenta_socket.c
View File

@ -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);