Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

net/ethernet: remove __dev* attributes 



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: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06b0e683

drivers/net/ethernet/dnet.c

+4 −4
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static void __dnet_set_hwaddr(struct dnet *bp) 
	dnet_writew_mac(bp, DNET_INTERNAL_MAC_ADDR_2_REG, tmp);

}



static void __devinit dnet_get_hwaddr(struct dnet *bp)

static void dnet_get_hwaddr(struct dnet *bp)

{

	u16 tmp;

	u8 addr[6];
@@ -826,7 +826,7 @@ static const struct net_device_ops dnet_netdev_ops = { 
	.ndo_change_mtu		= eth_change_mtu,

};



static int __devinit dnet_probe(struct platform_device *pdev)

static int dnet_probe(struct platform_device *pdev)

{

	struct resource *res;

	struct net_device *dev;
@@ -942,7 +942,7 @@ static int __devinit dnet_probe(struct platform_device *pdev) 
	return err;

}



static int __devexit dnet_remove(struct platform_device *pdev)

static int dnet_remove(struct platform_device *pdev)

{



	struct net_device *dev;
@@ -968,7 +968,7 @@ static int __devexit dnet_remove(struct platform_device *pdev) 


static struct platform_driver dnet_driver = {

	.probe		= dnet_probe,

	.remove		= __devexit_p(dnet_remove),

	.remove		= dnet_remove,

	.driver		= {

		.name		= "dnet",

	},

drivers/net/ethernet/ethoc.c

+4 −4
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ static void ethoc_mdio_poll(struct net_device *dev) 
{

}



static int __devinit ethoc_mdio_probe(struct net_device *dev)

static int ethoc_mdio_probe(struct net_device *dev)

{

	struct ethoc *priv = netdev_priv(dev);

	struct phy_device *phy;
@@ -905,7 +905,7 @@ static const struct net_device_ops ethoc_netdev_ops = { 
 * ethoc_probe - initialize OpenCores ethernet MAC

 * pdev:	platform device

 */

static int __devinit ethoc_probe(struct platform_device *pdev)

static int ethoc_probe(struct platform_device *pdev)

{

	struct net_device *netdev = NULL;

	struct resource *res = NULL;
@@ -1143,7 +1143,7 @@ static int __devinit ethoc_probe(struct platform_device *pdev) 
 * ethoc_remove - shutdown OpenCores ethernet MAC

 * @pdev:	platform device

 */

static int __devexit ethoc_remove(struct platform_device *pdev)

static int ethoc_remove(struct platform_device *pdev)

{

	struct net_device *netdev = platform_get_drvdata(pdev);

	struct ethoc *priv = netdev_priv(netdev);
@@ -1190,7 +1190,7 @@ MODULE_DEVICE_TABLE(of, ethoc_match); 


static struct platform_driver ethoc_driver = {

	.probe   = ethoc_probe,

	.remove  = __devexit_p(ethoc_remove),

	.remove  = ethoc_remove,

	.suspend = ethoc_suspend,

	.resume  = ethoc_resume,

	.driver  = {

drivers/net/ethernet/fealnx.c

+5 −5
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int full_duplex[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1 }; 
#include <asm/byteorder.h>



/* These identify the driver base version and may not be removed. */

static const char version[] __devinitconst =

static const char version[] =

	KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE "\n";
@@ -150,7 +150,7 @@ struct chip_info { 
	int flags;

};



static const struct chip_info skel_netdrv_tbl[] __devinitconst = {

static const struct chip_info skel_netdrv_tbl[] = {

 	{ "100/10M Ethernet PCI Adapter",	HAS_MII_XCVR },

	{ "100/10M Ethernet PCI Adapter",	HAS_CHIP_XCVR },

	{ "1000/100/10M Ethernet PCI Adapter",	HAS_MII_XCVR },
@@ -477,7 +477,7 @@ static const struct net_device_ops netdev_ops = { 
	.ndo_validate_addr	= eth_validate_addr,

};



static int __devinit fealnx_init_one(struct pci_dev *pdev,

static int fealnx_init_one(struct pci_dev *pdev,

				     const struct pci_device_id *ent)

{

	struct netdev_private *np;
@@ -684,7 +684,7 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, 
}





static void __devexit fealnx_remove_one(struct pci_dev *pdev)

static void fealnx_remove_one(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);
@@ -1950,7 +1950,7 @@ static struct pci_driver fealnx_driver = { 
	.name		= "fealnx",

	.id_table	= fealnx_pci_tbl,

	.probe		= fealnx_init_one,

	.remove		= __devexit_p(fealnx_remove_one),

	.remove		= fealnx_remove_one,

};



static int __init fealnx_init(void)

drivers/net/ethernet/lantiq_etop.c

+2 −2
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ ltq_etop_probe(struct platform_device *pdev) 
	return err;

}



static int __devexit

static int

ltq_etop_remove(struct platform_device *pdev)

{

	struct net_device *dev = platform_get_drvdata(pdev);
@@ -789,7 +789,7 @@ ltq_etop_remove(struct platform_device *pdev) 
}



static struct platform_driver ltq_mii_driver = {

	.remove = __devexit_p(ltq_etop_remove),

	.remove = ltq_etop_remove,

	.driver = {

		.name = "ltq_etop",

		.owner = THIS_MODULE,

drivers/net/ethernet/s6gmac.c

+3 −3
Original line number Diff line number Diff line
@@ -954,7 +954,7 @@ static struct net_device_stats *s6gmac_stats(struct net_device *dev) 
	return st;

}



static int __devinit s6gmac_probe(struct platform_device *pdev)

static int s6gmac_probe(struct platform_device *pdev)

{

	struct net_device *dev;

	struct s6gmac *pd;
@@ -1030,7 +1030,7 @@ static int __devinit s6gmac_probe(struct platform_device *pdev) 
	return res;

}



static int __devexit s6gmac_remove(struct platform_device *pdev)

static int s6gmac_remove(struct platform_device *pdev)

{

	struct net_device *dev = platform_get_drvdata(pdev);

	if (dev) {
@@ -1046,7 +1046,7 @@ static int __devexit s6gmac_remove(struct platform_device *pdev) 


static struct platform_driver s6gmac_driver = {

	.probe = s6gmac_probe,

	.remove = __devexit_p(s6gmac_remove),

	.remove = s6gmac_remove,

	.driver = {

		.name = "s6gmac",

		.owner = THIS_MODULE,