aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-05-27 15:01:12 -0400
committerDavid S. Miller <davem@davemloft.net>2013-05-28 01:34:51 -0400
commitdfd93c977d84fef77404b689ef95bc716b313533 (patch)
treeab1084c9933e81cd603f5b01d3f50b53dc2d2f5d /drivers/net/ethernet/marvell
parent3acfeac351c6ab2fe1139ee13d780729af0c8145 (diff)
net: ethernet: remove unnecessary platform_set_drvdata()
The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Roland Stigge <stigge@antcom.de> Acked-by: Mugunthan V N <mugunthanvnm@ti.com> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com> Tested-by: Roland Stigge <stigge@antcom.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
-rw-r--r--drivers/net/ethernet/marvell/mv643xx_eth.c2
-rw-r--r--drivers/net/ethernet/marvell/mvneta.c2
-rw-r--r--drivers/net/ethernet/marvell/pxa168_eth.c1
3 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 2ad1494efbb3..afb8bcbe29f8 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2813,8 +2813,6 @@ static int mv643xx_eth_remove(struct platform_device *pdev)
2813 2813
2814 free_netdev(mp->dev); 2814 free_netdev(mp->dev);
2815 2815
2816 platform_set_drvdata(pdev, NULL);
2817
2818 return 0; 2816 return 0;
2819} 2817}
2820 2818
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index c96678555233..cd0ea204ac24 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -2804,8 +2804,6 @@ static int mvneta_remove(struct platform_device *pdev)
2804 irq_dispose_mapping(dev->irq); 2804 irq_dispose_mapping(dev->irq);
2805 free_netdev(dev); 2805 free_netdev(dev);
2806 2806
2807 platform_set_drvdata(pdev, NULL);
2808
2809 return 0; 2807 return 0;
2810} 2808}
2811 2809
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 339bb323cb0c..2602cf7ba642 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1602,7 +1602,6 @@ static int pxa168_eth_remove(struct platform_device *pdev)
1602 unregister_netdev(dev); 1602 unregister_netdev(dev);
1603 cancel_work_sync(&pep->tx_timeout_task); 1603 cancel_work_sync(&pep->tx_timeout_task);
1604 free_netdev(dev); 1604 free_netdev(dev);
1605 platform_set_drvdata(pdev, NULL);
1606 return 0; 1605 return 0;
1607} 1606}
1608 1607