diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-05-27 15:01:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-05-28 01:34:51 -0400 |
commit | dfd93c977d84fef77404b689ef95bc716b313533 (patch) | |
tree | ab1084c9933e81cd603f5b01d3f50b53dc2d2f5d /drivers/net/ethernet/ti | |
parent | 3acfeac351c6ab2fe1139ee13d780729af0c8145 (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/ti')
-rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/ti/davinci_emac.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 21a5b291b4b3..89a4c40d6d83 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c | |||
@@ -1940,7 +1940,6 @@ static int cpsw_remove(struct platform_device *pdev) | |||
1940 | struct cpsw_priv *priv = netdev_priv(ndev); | 1940 | struct cpsw_priv *priv = netdev_priv(ndev); |
1941 | int i; | 1941 | int i; |
1942 | 1942 | ||
1943 | platform_set_drvdata(pdev, NULL); | ||
1944 | if (priv->data.dual_emac) | 1943 | if (priv->data.dual_emac) |
1945 | unregister_netdev(cpsw_get_slave_ndev(priv, 1)); | 1944 | unregister_netdev(cpsw_get_slave_ndev(priv, 1)); |
1946 | unregister_netdev(ndev); | 1945 | unregister_netdev(ndev); |
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index 860e15ddfbcb..efb6f65a8be3 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c | |||
@@ -2037,8 +2037,6 @@ static int davinci_emac_remove(struct platform_device *pdev) | |||
2037 | 2037 | ||
2038 | dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n"); | 2038 | dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n"); |
2039 | 2039 | ||
2040 | platform_set_drvdata(pdev, NULL); | ||
2041 | |||
2042 | if (priv->txchan) | 2040 | if (priv->txchan) |
2043 | cpdma_chan_destroy(priv->txchan); | 2041 | cpdma_chan_destroy(priv->txchan); |
2044 | if (priv->rxchan) | 2042 | if (priv->rxchan) |