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

Commit 682d7978 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'dev_removal' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/net-next 



Networking:  Remove __dev* markings from the networking drivers

This is a series of patches that remove the dev* attributes for all
networking drivers, with the exception of wireless drivers, those are in
a different branch.

Use of __devinit, __devexit_p, __devinitdata, __devinitconst, and
__devexit are no longer needed since CONFIG_HOTPLUG is being removed as
an option.

Note, there are some devinit compiler section mismatch warnings due to
this series, but they are fixed up when merged with my driver-next
branch, which fixes the PCI device id warnings, and removes the modpost
detection, as it's no longer needed.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a5a81f0b 9f9a12f8

drivers/net/arcnet/com20020-pci.c

+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ module_param(clockp, int, 0); 
module_param(clockm, int, 0);

MODULE_LICENSE("GPL");



static int __devinit com20020pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)

static int com20020pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{

	struct net_device *dev;

	struct arcnet_local *lp;
@@ -135,7 +135,7 @@ out_dev: 
	return err;

}



static void __devexit com20020pci_remove(struct pci_dev *pdev)

static void com20020pci_remove(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);

	unregister_netdev(dev);
@@ -178,7 +178,7 @@ static struct pci_driver com20020pci_driver = { 
	.name		= "com20020",

	.id_table	= com20020pci_id_table,

	.probe		= com20020pci_probe,

	.remove		= __devexit_p(com20020pci_remove),

	.remove		= com20020pci_remove,

};



static int __init com20020pci_init(void)

drivers/net/can/at91_can.c

+4 −4
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ struct at91_priv { 
	canid_t mb0_id;

};



static const struct at91_devtype_data at91_devtype_data[] __devinitconst = {

static const struct at91_devtype_data at91_devtype_data[] = {

	[AT91_DEVTYPE_SAM9263] = {

		.rx_first = 1,

		.rx_split = 8,
@@ -1242,7 +1242,7 @@ static struct attribute_group at91_sysfs_attr_group = { 
	.attrs = at91_sysfs_attrs,

};



static int __devinit at91_can_probe(struct platform_device *pdev)

static int at91_can_probe(struct platform_device *pdev)

{

	const struct at91_devtype_data *devtype_data;

	enum at91_devtype devtype;
@@ -1339,7 +1339,7 @@ static int __devinit at91_can_probe(struct platform_device *pdev) 
	return err;

}



static int __devexit at91_can_remove(struct platform_device *pdev)

static int at91_can_remove(struct platform_device *pdev)

{

	struct net_device *dev = platform_get_drvdata(pdev);

	struct at91_priv *priv = netdev_priv(dev);
@@ -1376,7 +1376,7 @@ MODULE_DEVICE_TABLE(platform, at91_can_id_table); 


static struct platform_driver at91_can_driver = {

	.probe = at91_can_probe,

	.remove = __devexit_p(at91_can_remove),

	.remove = at91_can_remove,

	.driver = {

		.name = KBUILD_MODNAME,

		.owner = THIS_MODULE,

drivers/net/can/bfin_can.c

+3 −3
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ static const struct net_device_ops bfin_can_netdev_ops = { 
	.ndo_start_xmit         = bfin_can_start_xmit,

};



static int __devinit bfin_can_probe(struct platform_device *pdev)

static int bfin_can_probe(struct platform_device *pdev)

{

	int err;

	struct net_device *dev;
@@ -611,7 +611,7 @@ exit: 
	return err;

}



static int __devexit bfin_can_remove(struct platform_device *pdev)

static int bfin_can_remove(struct platform_device *pdev)

{

	struct net_device *dev = dev_get_drvdata(&pdev->dev);

	struct bfin_can_priv *priv = netdev_priv(dev);
@@ -677,7 +677,7 @@ static int bfin_can_resume(struct platform_device *pdev) 


static struct platform_driver bfin_can_driver = {

	.probe = bfin_can_probe,

	.remove = __devexit_p(bfin_can_remove),

	.remove = bfin_can_remove,

	.suspend = bfin_can_suspend,

	.resume = bfin_can_resume,

	.driver = {

drivers/net/can/c_can/c_can_pci.c

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static void c_can_pci_write_reg_aligned_to_32bit(struct c_can_priv *priv, 
	writew(val, priv->base + 2 * priv->regs[index]);

}



static int __devinit c_can_pci_probe(struct pci_dev *pdev,

static int c_can_pci_probe(struct pci_dev *pdev,

				     const struct pci_device_id *ent)

{

	struct c_can_pci_data *c_can_pci_data = (void *)ent->driver_data;
@@ -174,7 +174,7 @@ out: 
	return ret;

}



static void __devexit c_can_pci_remove(struct pci_dev *pdev)

static void c_can_pci_remove(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct c_can_priv *priv = netdev_priv(dev);
@@ -210,7 +210,7 @@ static struct pci_driver c_can_pci_driver = { 
	.name = KBUILD_MODNAME,

	.id_table = c_can_pci_tbl,

	.probe = c_can_pci_probe,

	.remove = __devexit_p(c_can_pci_remove),

	.remove = c_can_pci_remove,

};



module_pci_driver(c_can_pci_driver);

drivers/net/can/c_can/c_can_platform.c

+3 −3
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static const struct of_device_id c_can_of_table[] = { 
};

MODULE_DEVICE_TABLE(of, c_can_of_table);



static int __devinit c_can_plat_probe(struct platform_device *pdev)

static int c_can_plat_probe(struct platform_device *pdev)

{

	int ret;

	void __iomem *addr;
@@ -248,7 +248,7 @@ exit: 
	return ret;

}



static int __devexit c_can_plat_remove(struct platform_device *pdev)

static int c_can_plat_remove(struct platform_device *pdev)

{

	struct net_device *dev = platform_get_drvdata(pdev);

	struct c_can_priv *priv = netdev_priv(dev);
@@ -334,7 +334,7 @@ static struct platform_driver c_can_plat_driver = { 
		.of_match_table = of_match_ptr(c_can_of_table),

	},

	.probe = c_can_plat_probe,

	.remove = __devexit_p(c_can_plat_remove),

	.remove = c_can_plat_remove,

	.suspend = c_can_suspend,

	.resume = c_can_resume,

	.id_table = c_can_id_table,