Skip to contentSkip to conversation

net: ethernet: calxeda: remove unnecessary platform_set_drvdata()

PATCH Applied Jingoo Han 2 participants 2 messages May 7, 2013

Subsystems (2)
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 10/36 net: ethernet: calxeda: 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/calxeda/xgmac.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/net/ethernet/calxeda/xgmac.c +0 -2
index 4a1f2fa..7cb148c 100644
@@ -1790,7 +1790,6 @@ err_io:
 	free_netdev(ndev);
 err_alloc:
 	release_mem_region(res->start, resource_size(res));
-	platform_set_drvdata(pdev, NULL);
 	return ret;
 }
 
@@ -1813,7 +1812,6 @@ static int xgmac_remove(struct platform_device *pdev)
 	free_irq(ndev->irq, ndev);
 	free_irq(priv->pmt_irq, ndev);
 
-	platform_set_drvdata(pdev, NULL);
 	unregister_netdev(ndev);
 	netif_napi_del(&priv->napi);
 
Signature · 1 line
1.7.2.5
Acked-by on v1 10/36
#1 lore raw
Quoted 6 lines · Jingoo Han

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.

netdev is closed during the merge window except for fixes, so you will have to resubmit this. But when you do:

Quoted 25 lines
---
 drivers/net/ethernet/calxeda/xgmac.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/net/ethernet/calxeda/xgmac.c +0 -2
index 4a1f2fa..7cb148c 100644
@@ -1790,7 +1790,6 @@ err_io:
 	free_netdev(ndev);
 err_alloc:
 	release_mem_region(res->start, resource_size(res));
-	platform_set_drvdata(pdev, NULL);
 	return ret;
 }
 
@@ -1813,7 +1812,6 @@ static int xgmac_remove(struct platform_device *pdev)
 	free_irq(ndev->irq, ndev);
 	free_irq(priv->pmt_irq, ndev);
 
-	platform_set_drvdata(pdev, NULL);
 	unregister_netdev(ndev);
 	netif_napi_del(&priv->napi);