Skip to contentSkip to conversation

net: ethernet: micrel: remove unnecessary platform_set_drvdata()

PATCH Applied Jingoo Han 1 participant 1 message May 7, 2013

Subsystems (2)
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 18/36 net: ethernet: micrel: 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.

---
 drivers/net/ethernet/micrel/ks8695net.c  |    1 -
 drivers/net/ethernet/micrel/ks8842.c     |    1 -
 drivers/net/ethernet/micrel/ks8851_mll.c |    1 -
 3 files changed, 0 insertions(+), 3 deletions(-)
drivers/net/ethernet/micrel/ks8695net.c +0 -1
index b6c60fd..106eb97 100644
@@ -1600,7 +1600,6 @@ ks8695_drv_remove(struct platform_device *pdev)
 	struct net_device *ndev = platform_get_drvdata(pdev);
 	struct ks8695_priv *ksp = netdev_priv(ndev);
 
-	platform_set_drvdata(pdev, NULL);
 	netif_napi_del(&ksp->napi);
 
 	unregister_netdev(ndev);
drivers/net/ethernet/micrel/ks8842.c +0 -1
index fbcb9e7..e393d99 100644
@@ -1250,7 +1250,6 @@ static int ks8842_remove(struct platform_device *pdev)
 	iounmap(adapter->hw_addr);
 	free_netdev(netdev);
 	release_mem_region(iomem->start, resource_size(iomem));
-	platform_set_drvdata(pdev, NULL);
 	return 0;
 }
 
drivers/net/ethernet/micrel/ks8851_mll.c +0 -1
index ddaf138ce..e9b1a83 100644
@@ -1671,7 +1671,6 @@ static int ks8851_remove(struct platform_device *pdev)
 	iounmap(ks->hw_addr);
 	free_netdev(netdev);
 	release_mem_region(iomem->start, resource_size(iomem));
-	platform_set_drvdata(pdev, NULL);
 	return 0;
 
 }
Signature · 1 line
1.7.2.5