diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:23:50 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 14:16:53 -0500 |
commit | 48d16cb1befb39ab1d7dc5842182d6133d88de0e (patch) | |
tree | d506fbefc95ef63537bc4cdfe2865436eba05655 /drivers | |
parent | 27add00620ed820f94c8d332591fe73ba384b7e9 (diff) |
xilinx_axienet: 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: Bill Pemberton <wfp5p@virginia.edu>
Cc: Anirudha Sarangi <anirudh@xilinx.com>
Cc: John Linn <John.Linn@xilinx.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index a788501e978e..d9f69b82cc4f 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c | |||
@@ -48,7 +48,7 @@ | |||
48 | #define AXIENET_REGS_N 32 | 48 | #define AXIENET_REGS_N 32 |
49 | 49 | ||
50 | /* Match table for of_platform binding */ | 50 | /* Match table for of_platform binding */ |
51 | static struct of_device_id axienet_of_match[] __devinitdata = { | 51 | static struct of_device_id axienet_of_match[] = { |
52 | { .compatible = "xlnx,axi-ethernet-1.00.a", }, | 52 | { .compatible = "xlnx,axi-ethernet-1.00.a", }, |
53 | { .compatible = "xlnx,axi-ethernet-1.01.a", }, | 53 | { .compatible = "xlnx,axi-ethernet-1.01.a", }, |
54 | { .compatible = "xlnx,axi-ethernet-2.01.a", }, | 54 | { .compatible = "xlnx,axi-ethernet-2.01.a", }, |
@@ -1482,7 +1482,7 @@ static void axienet_dma_err_handler(unsigned long data) | |||
1482 | * device. Parses through device tree and populates fields of | 1482 | * device. Parses through device tree and populates fields of |
1483 | * axienet_local. It registers the Ethernet device. | 1483 | * axienet_local. It registers the Ethernet device. |
1484 | */ | 1484 | */ |
1485 | static int __devinit axienet_of_probe(struct platform_device *op) | 1485 | static int axienet_of_probe(struct platform_device *op) |
1486 | { | 1486 | { |
1487 | __be32 *p; | 1487 | __be32 *p; |
1488 | int size, ret = 0; | 1488 | int size, ret = 0; |
@@ -1632,7 +1632,7 @@ nodev: | |||
1632 | return ret; | 1632 | return ret; |
1633 | } | 1633 | } |
1634 | 1634 | ||
1635 | static int __devexit axienet_of_remove(struct platform_device *op) | 1635 | static int axienet_of_remove(struct platform_device *op) |
1636 | { | 1636 | { |
1637 | struct net_device *ndev = dev_get_drvdata(&op->dev); | 1637 | struct net_device *ndev = dev_get_drvdata(&op->dev); |
1638 | struct axienet_local *lp = netdev_priv(ndev); | 1638 | struct axienet_local *lp = netdev_priv(ndev); |
@@ -1656,7 +1656,7 @@ static int __devexit axienet_of_remove(struct platform_device *op) | |||
1656 | 1656 | ||
1657 | static struct platform_driver axienet_of_driver = { | 1657 | static struct platform_driver axienet_of_driver = { |
1658 | .probe = axienet_of_probe, | 1658 | .probe = axienet_of_probe, |
1659 | .remove = __devexit_p(axienet_of_remove), | 1659 | .remove = axienet_of_remove, |
1660 | .driver = { | 1660 | .driver = { |
1661 | .owner = THIS_MODULE, | 1661 | .owner = THIS_MODULE, |
1662 | .name = "xilinx_axienet", | 1662 | .name = "xilinx_axienet", |