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/micrel | |
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/micrel')
-rw-r--r-- | drivers/net/ethernet/micrel/ks8695net.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/micrel/ks8842.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/micrel/ks8851_mll.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/micrel/ks8695net.c b/drivers/net/ethernet/micrel/ks8695net.c index b6c60fdef4ff..106eb972f2ac 100644 --- a/drivers/net/ethernet/micrel/ks8695net.c +++ b/drivers/net/ethernet/micrel/ks8695net.c | |||
@@ -1600,7 +1600,6 @@ ks8695_drv_remove(struct platform_device *pdev) | |||
1600 | struct net_device *ndev = platform_get_drvdata(pdev); | 1600 | struct net_device *ndev = platform_get_drvdata(pdev); |
1601 | struct ks8695_priv *ksp = netdev_priv(ndev); | 1601 | struct ks8695_priv *ksp = netdev_priv(ndev); |
1602 | 1602 | ||
1603 | platform_set_drvdata(pdev, NULL); | ||
1604 | netif_napi_del(&ksp->napi); | 1603 | netif_napi_del(&ksp->napi); |
1605 | 1604 | ||
1606 | unregister_netdev(ndev); | 1605 | unregister_netdev(ndev); |
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c index fbcb9e74d7fc..e393d998be89 100644 --- a/drivers/net/ethernet/micrel/ks8842.c +++ b/drivers/net/ethernet/micrel/ks8842.c | |||
@@ -1250,7 +1250,6 @@ static int ks8842_remove(struct platform_device *pdev) | |||
1250 | iounmap(adapter->hw_addr); | 1250 | iounmap(adapter->hw_addr); |
1251 | free_netdev(netdev); | 1251 | free_netdev(netdev); |
1252 | release_mem_region(iomem->start, resource_size(iomem)); | 1252 | release_mem_region(iomem->start, resource_size(iomem)); |
1253 | platform_set_drvdata(pdev, NULL); | ||
1254 | return 0; | 1253 | return 0; |
1255 | } | 1254 | } |
1256 | 1255 | ||
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c index ddaf138ce0d4..e9b1a830d582 100644 --- a/drivers/net/ethernet/micrel/ks8851_mll.c +++ b/drivers/net/ethernet/micrel/ks8851_mll.c | |||
@@ -1671,7 +1671,6 @@ static int ks8851_remove(struct platform_device *pdev) | |||
1671 | iounmap(ks->hw_addr); | 1671 | iounmap(ks->hw_addr); |
1672 | free_netdev(netdev); | 1672 | free_netdev(netdev); |
1673 | release_mem_region(iomem->start, resource_size(iomem)); | 1673 | release_mem_region(iomem->start, resource_size(iomem)); |
1674 | platform_set_drvdata(pdev, NULL); | ||
1675 | return 0; | 1674 | return 0; |
1676 | 1675 | ||
1677 | } | 1676 | } |