Skip to content

Commit

Permalink
xilinx_axienet: remove __dev* attributes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Dec 3, 2012
1 parent 27add00 commit 48d16cb
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/net/ethernet/xilinx/xilinx_axienet_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#define AXIENET_REGS_N 32

/* Match table for of_platform binding */
static struct of_device_id axienet_of_match[] __devinitdata = {
static struct of_device_id axienet_of_match[] = {
{ .compatible = "xlnx,axi-ethernet-1.00.a", },
{ .compatible = "xlnx,axi-ethernet-1.01.a", },
{ .compatible = "xlnx,axi-ethernet-2.01.a", },
Expand Down Expand Up @@ -1482,7 +1482,7 @@ static void axienet_dma_err_handler(unsigned long data)
* device. Parses through device tree and populates fields of
* axienet_local. It registers the Ethernet device.
*/
static int __devinit axienet_of_probe(struct platform_device *op)
static int axienet_of_probe(struct platform_device *op)
{
__be32 *p;
int size, ret = 0;
Expand Down Expand Up @@ -1632,7 +1632,7 @@ static int __devinit axienet_of_probe(struct platform_device *op)
return ret;
}

static int __devexit axienet_of_remove(struct platform_device *op)
static int axienet_of_remove(struct platform_device *op)
{
struct net_device *ndev = dev_get_drvdata(&op->dev);
struct axienet_local *lp = netdev_priv(ndev);
Expand All @@ -1656,7 +1656,7 @@ static int __devexit axienet_of_remove(struct platform_device *op)

static struct platform_driver axienet_of_driver = {
.probe = axienet_of_probe,
.remove = __devexit_p(axienet_of_remove),
.remove = axienet_of_remove,
.driver = {
.owner = THIS_MODULE,
.name = "xilinx_axienet",
Expand Down

0 comments on commit 48d16cb

Please sign in to comment.