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

net/amd: 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 af37557b

drivers/net/ethernet/amd/a2065.c

+6 −6
Original line number Diff line number Diff line
@@ -639,12 +639,12 @@ static void lance_set_multicast(struct net_device *dev) 
	netif_wake_queue(dev);

}



static int __devinit a2065_init_one(struct zorro_dev *z,

static int a2065_init_one(struct zorro_dev *z,

				    const struct zorro_device_id *ent);

static void __devexit a2065_remove_one(struct zorro_dev *z);

static void a2065_remove_one(struct zorro_dev *z);





static struct zorro_device_id a2065_zorro_tbl[] __devinitdata = {

static struct zorro_device_id a2065_zorro_tbl[] = {

	{ ZORRO_PROD_CBM_A2065_1 },

	{ ZORRO_PROD_CBM_A2065_2 },

	{ ZORRO_PROD_AMERISTAR_A2065 },
@@ -656,7 +656,7 @@ static struct zorro_driver a2065_driver = { 
	.name		= "a2065",

	.id_table	= a2065_zorro_tbl,

	.probe		= a2065_init_one,

	.remove		= __devexit_p(a2065_remove_one),

	.remove		= a2065_remove_one,

};



static const struct net_device_ops lance_netdev_ops = {
@@ -670,7 +670,7 @@ static const struct net_device_ops lance_netdev_ops = { 
	.ndo_set_mac_address	= eth_mac_addr,

};



static int __devinit a2065_init_one(struct zorro_dev *z,

static int a2065_init_one(struct zorro_dev *z,

				    const struct zorro_device_id *ent)

{

	struct net_device *dev;
@@ -754,7 +754,7 @@ static int __devinit a2065_init_one(struct zorro_dev *z, 
}





static void __devexit a2065_remove_one(struct zorro_dev *z)

static void a2065_remove_one(struct zorro_dev *z)

{

	struct net_device *dev = zorro_get_drvdata(z);

drivers/net/ethernet/amd/amd8111e.c

+4 −4
Original line number Diff line number Diff line
@@ -1702,7 +1702,7 @@ static int amd8111e_resume(struct pci_dev *pci_dev) 
}





static void __devexit amd8111e_remove_one(struct pci_dev *pdev)

static void amd8111e_remove_one(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);

	if (dev) {
@@ -1774,7 +1774,7 @@ static void amd8111e_config_ipg(struct net_device* dev) 


}



static void __devinit amd8111e_probe_ext_phy(struct net_device* dev)

static void amd8111e_probe_ext_phy(struct net_device *dev)

{

	struct amd8111e_priv *lp = netdev_priv(dev);

	int i;
@@ -1810,7 +1810,7 @@ static const struct net_device_ops amd8111e_netdev_ops = { 
#endif

};



static int __devinit amd8111e_probe_one(struct pci_dev *pdev,

static int amd8111e_probe_one(struct pci_dev *pdev,

				  const struct pci_device_id *ent)

{

	int err,i,pm_cap;
@@ -1976,7 +1976,7 @@ static struct pci_driver amd8111e_driver = { 
	.name   	= MODULE_NAME,

	.id_table	= amd8111e_pci_tbl,

	.probe		= amd8111e_probe_one,

	.remove		= __devexit_p(amd8111e_remove_one),

	.remove		= amd8111e_remove_one,

	.suspend	= amd8111e_suspend,

	.resume		= amd8111e_resume

};

drivers/net/ethernet/amd/ariadne.c

+4 −4
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ static void set_multicast_list(struct net_device *dev) 
}





static void __devexit ariadne_remove_one(struct zorro_dev *z)

static void ariadne_remove_one(struct zorro_dev *z)

{

	struct net_device *dev = zorro_get_drvdata(z);
@@ -692,7 +692,7 @@ static void __devexit ariadne_remove_one(struct zorro_dev *z) 
	free_netdev(dev);

}



static struct zorro_device_id ariadne_zorro_tbl[] __devinitdata = {

static struct zorro_device_id ariadne_zorro_tbl[] = {

	{ ZORRO_PROD_VILLAGE_TRONIC_ARIADNE },

	{ 0 }

};
@@ -710,7 +710,7 @@ static const struct net_device_ops ariadne_netdev_ops = { 
	.ndo_set_mac_address	= eth_mac_addr,

};



static int __devinit ariadne_init_one(struct zorro_dev *z,

static int ariadne_init_one(struct zorro_dev *z,

				      const struct zorro_device_id *ent)

{

	unsigned long board = z->resource.start;
@@ -774,7 +774,7 @@ static struct zorro_driver ariadne_driver = { 
	.name		= "ariadne",

	.id_table	= ariadne_zorro_tbl,

	.probe		= ariadne_init_one,

	.remove		= __devexit_p(ariadne_remove_one),

	.remove		= ariadne_remove_one,

};



static int __init ariadne_init_module(void)

drivers/net/ethernet/amd/au1000_eth.c

+3 −3
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ static const struct net_device_ops au1000_netdev_ops = { 
	.ndo_change_mtu		= eth_change_mtu,

};



static int __devinit au1000_probe(struct platform_device *pdev)

static int au1000_probe(struct platform_device *pdev)

{

	static unsigned version_printed;

	struct au1000_private *aup = NULL;
@@ -1295,7 +1295,7 @@ out: 
	return err;

}



static int __devexit au1000_remove(struct platform_device *pdev)

static int au1000_remove(struct platform_device *pdev)

{

	struct net_device *dev = platform_get_drvdata(pdev);

	struct au1000_private *aup = netdev_priv(dev);
@@ -1340,7 +1340,7 @@ static int __devexit au1000_remove(struct platform_device *pdev) 


static struct platform_driver au1000_eth_driver = {

	.probe  = au1000_probe,

	.remove = __devexit_p(au1000_remove),

	.remove = au1000_remove,

	.driver = {

		.name   = "au1000-eth",

		.owner  = THIS_MODULE,

drivers/net/ethernet/amd/declance.c

+4 −4
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
#include <asm/dec/machtype.h>

#include <asm/dec/system.h>



static char version[] __devinitdata =

static char version[] =

"declance.c: v0.011 by Linux MIPS DECstation task force\n";



MODULE_AUTHOR("Linux MIPS DECstation task force");
@@ -1020,7 +1020,7 @@ static const struct net_device_ops lance_netdev_ops = { 
	.ndo_set_mac_address	= eth_mac_addr,

};



static int __devinit dec_lance_probe(struct device *bdev, const int type)

static int dec_lance_probe(struct device *bdev, const int type)

{

	static unsigned version_printed;

	static const char fmt[] = "declance%d";
@@ -1322,7 +1322,7 @@ static void __exit dec_lance_platform_remove(void) 
}



#ifdef CONFIG_TC

static int __devinit dec_lance_tc_probe(struct device *dev);

static int dec_lance_tc_probe(struct device *dev);

static int __exit dec_lance_tc_remove(struct device *dev);



static const struct tc_device_id dec_lance_tc_table[] = {
@@ -1341,7 +1341,7 @@ static struct tc_driver dec_lance_tc_driver = { 
	},

};



static int __devinit dec_lance_tc_probe(struct device *dev)

static int dec_lance_tc_probe(struct device *dev)

{

        int status = dec_lance_probe(dev, PMAD_LANCE);

        if (!status)

CRA Git | Maintained and supported by SUSTech CRA and CCSE