Skip to contentSkip to conversation

net: ethernet: wiznet: remove unnecessary platform_set_drvdata()

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

Subsystems (3)
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 30/36 net: ethernet: wiznet: 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/wiznet/w5100.c |    2 --
 drivers/net/ethernet/wiznet/w5300.c |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)
drivers/net/ethernet/wiznet/w5100.c +0 -2
index a518dca..30fed08 100644
@@ -734,7 +734,6 @@ err_hw_probe:
 	unregister_netdev(ndev);
 err_register:
 	free_netdev(ndev);
-	platform_set_drvdata(pdev, NULL);
 	return err;
 }
 
@@ -750,7 +749,6 @@ static int w5100_remove(struct platform_device *pdev)
 
 	unregister_netdev(ndev);
 	free_netdev(ndev);
-	platform_set_drvdata(pdev, NULL);
 	return 0;
 }
 
drivers/net/ethernet/wiznet/w5300.c +0 -2
index 6e00e3f..e928845 100644
@@ -646,7 +646,6 @@ err_hw_probe:
 	unregister_netdev(ndev);
 err_register:
 	free_netdev(ndev);
-	platform_set_drvdata(pdev, NULL);
 	return err;
 }
 
@@ -662,7 +661,6 @@ static int w5300_remove(struct platform_device *pdev)
 
 	unregister_netdev(ndev);
 	free_netdev(ndev);
-	platform_set_drvdata(pdev, NULL);
 	return 0;
 }
 
Signature · 1 line
1.7.2.5