Commit 96364e3a authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

pcmcia: remove use of __devexit_p 



CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
needed.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 13ee2b94

drivers/pcmcia/bcm63xx_pcmcia.c

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/pcmcia/bfin_cf_pcmcia.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/pcmcia/db1xxx_ss.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/pcmcia/i82092.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

drivers/pcmcia/pd6729.c

+1 −1
Original line number Diff line number Diff line
@@ -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)