forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net/broadcom: remove __dev* attributes

Browse source 
CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

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-12-03 09:24:23 -05:00 • committed by Greg Kroah-Hartman
parent 8e0e46bb32
commit 047fc56614
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/net/ethernet/broadcom/bcm63xx_enet.c
View file

@ -1612,7 +1612,7 @@ static const struct net_device_ops bcm_enet_ops = {
/* /*
* allocate netdevice, request register memory and register device. * allocate netdevice, request register memory and register device.
*/ */
static int __devinit bcm_enet_probe(struct platform_device *pdev) static int bcm_enet_probe(struct platform_device *pdev)
{ {
struct bcm_enet_priv *priv; struct bcm_enet_priv *priv;
struct net_device *dev; struct net_device *dev;
@ -1830,7 +1830,7 @@ out:
/* /*
* exit func, stops hardware and unregisters netdevice * exit func, stops hardware and unregisters netdevice
*/ */
static int __devexit bcm_enet_remove(struct platform_device *pdev) static int bcm_enet_remove(struct platform_device *pdev)
{ {
struct bcm_enet_priv *priv; struct bcm_enet_priv *priv;
struct net_device *dev; struct net_device *dev;
@ -1877,7 +1877,7 @@ static int __devexit bcm_enet_remove(struct platform_device *pdev)
struct platform_driver bcm63xx_enet_driver = { struct platform_driver bcm63xx_enet_driver = {
.probe = bcm_enet_probe, .probe = bcm_enet_probe,
.remove = __devexit_p(bcm_enet_remove), .remove = bcm_enet_remove,
.driver = { .driver = {
.name = "bcm63xx_enet", .name = "bcm63xx_enet",
.owner = THIS_MODULE, .owner = THIS_MODULE,
@ -1887,7 +1887,7 @@ struct platform_driver bcm63xx_enet_driver = {
/* /*
* reserve & remap memory space shared between all macs * reserve & remap memory space shared between all macs
*/ */
static int __devinit bcm_enet_shared_probe(struct platform_device *pdev) static int bcm_enet_shared_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
unsigned int iomem_size; unsigned int iomem_size;
@ -1908,7 +1908,7 @@ static int __devinit bcm_enet_shared_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit bcm_enet_shared_remove(struct platform_device *pdev) static int bcm_enet_shared_remove(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
@ -1924,7 +1924,7 @@ static int __devexit bcm_enet_shared_remove(struct platform_device *pdev)
*/ */
struct platform_driver bcm63xx_enet_shared_driver = { struct platform_driver bcm63xx_enet_shared_driver = {
.probe = bcm_enet_shared_probe, .probe = bcm_enet_shared_probe,
.remove = __devexit_p(bcm_enet_shared_remove), .remove = bcm_enet_shared_remove,
.driver = { .driver = {
.name = "bcm63xx_enet_shared", .name = "bcm63xx_enet_shared",
.owner = THIS_MODULE, .owner = THIS_MODULE,

2
drivers/net/ethernet/broadcom/cnic.c
View file

@ -53,7 +53,7 @@
#define DRV_MODULE_NAME "cnic" #define DRV_MODULE_NAME "cnic"
static char version[] __devinitdata = static char version[] =
"Broadcom NetXtreme II CNIC Driver " DRV_MODULE_NAME " v" CNIC_MODULE_VERSION " (" CNIC_MODULE_RELDATE ")\n"; "Broadcom NetXtreme II CNIC Driver " DRV_MODULE_NAME " v" CNIC_MODULE_VERSION " (" CNIC_MODULE_RELDATE ")\n";
MODULE_AUTHOR("Michael Chan <mchan@broadcom.com> and John(Zongxi) " MODULE_AUTHOR("Michael Chan <mchan@broadcom.com> and John(Zongxi) "

2
drivers/net/ethernet/broadcom/sb1250-mac.c
View file

@ -2586,7 +2586,7 @@ static int sbmac_poll(struct napi_struct *napi, int budget)
} }
static int __devinit sbmac_probe(struct platform_device *pldev) static int sbmac_probe(struct platform_device *pldev)
{ {
struct net_device *dev; struct net_device *dev;
struct sbmac_softc *sc; struct sbmac_softc *sc;