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

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

net/xilinx: 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 0e1effe3

drivers/net/ethernet/xilinx/ll_temac_main.c

+4 −4
Original line number Diff line number Diff line
@@ -1002,7 +1002,7 @@ static const struct ethtool_ops temac_ethtool_ops = { 
	.get_ts_info = ethtool_op_get_ts_info,

};



static int __devinit temac_of_probe(struct platform_device *op)

static int temac_of_probe(struct platform_device *op)

{

	struct device_node *np;

	struct temac_local *lp;
@@ -1144,7 +1144,7 @@ static int __devinit temac_of_probe(struct platform_device *op) 
	return rc;

}



static int __devexit temac_of_remove(struct platform_device *op)

static int temac_of_remove(struct platform_device *op)

{

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

	struct temac_local *lp = netdev_priv(ndev);
@@ -1163,7 +1163,7 @@ static int __devexit temac_of_remove(struct platform_device *op) 
	return 0;

}



static struct of_device_id temac_of_match[] __devinitdata = {

static struct of_device_id temac_of_match[] = {

	{ .compatible = "xlnx,xps-ll-temac-1.01.b", },

	{ .compatible = "xlnx,xps-ll-temac-2.00.a", },

	{ .compatible = "xlnx,xps-ll-temac-2.02.a", },
@@ -1174,7 +1174,7 @@ MODULE_DEVICE_TABLE(of, temac_of_match); 


static struct platform_driver temac_of_driver = {

	.probe = temac_of_probe,

	.remove = __devexit_p(temac_of_remove),

	.remove = temac_of_remove,

	.driver = {

		.owner = THIS_MODULE,

		.name = "xilinx_temac",

drivers/net/ethernet/xilinx/xilinx_emaclite.c

+4 −4
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ static struct net_device_ops xemaclite_netdev_ops; 
 * Return:	0, if the driver is bound to the Emaclite device, or

 *		a negative error if there is failure.

 */

static int __devinit xemaclite_of_probe(struct platform_device *ofdev)

static int xemaclite_of_probe(struct platform_device *ofdev)

{

	struct resource r_irq; /* Interrupt resources */

	struct resource r_mem; /* IO mem resources */
@@ -1229,7 +1229,7 @@ static int __devinit xemaclite_of_probe(struct platform_device *ofdev) 
 *

 * Return:	0, always.

 */

static int __devexit xemaclite_of_remove(struct platform_device *of_dev)

static int xemaclite_of_remove(struct platform_device *of_dev)

{

	struct device *dev = &of_dev->dev;

	struct net_device *ndev = dev_get_drvdata(dev);
@@ -1280,7 +1280,7 @@ static struct net_device_ops xemaclite_netdev_ops = { 
};



/* Match table for OF platform binding */

static struct of_device_id xemaclite_of_match[] __devinitdata = {

static struct of_device_id xemaclite_of_match[] = {

	{ .compatible = "xlnx,opb-ethernetlite-1.01.a", },

	{ .compatible = "xlnx,opb-ethernetlite-1.01.b", },

	{ .compatible = "xlnx,xps-ethernetlite-1.00.a", },
@@ -1298,7 +1298,7 @@ static struct platform_driver xemaclite_of_driver = { 
		.of_match_table = xemaclite_of_match,

	},

	.probe		= xemaclite_of_probe,

	.remove		= __devexit_p(xemaclite_of_remove),

	.remove		= xemaclite_of_remove,

};



module_platform_driver(xemaclite_of_driver);