Skip to contentSkip to conversation

net: fs_enet: use platform_{get,set}_drvdata()

PATCH Superseded Libo Chen 2 participants 3 messages Aug 12, 2013 – Aug 14, 2013

Subsystems (3)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Libo Chen

author
#0 lore raw

PATCH 4/8 net: fs_enet: use platform_{get,set}_drvdata()

Use the wrapper functions for getting and setting the driver data using platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev, so we can directly pass a struct platform_device.

---
 .../net/ethernet/freescale/fs_enet/fs_enet-main.c  |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +0 -1
index 8de53a1..7e3de10 100644
@@ -1122,7 +1122,6 @@ static int fs_enet_remove(struct platform_device *ofdev)
 
 	fep->ops->free_bd(ndev);
 	fep->ops->cleanup_data(ndev);
-	dev_set_drvdata(fep->dev, NULL);
 	of_node_put(fep->fpi->phy_node);
 	free_netdev(ndev);
 	return 0;
Signature · 1 line
1.7.1
#1 lore raw
Quoted 14 lines · Libo Chen

Use the wrapper functions for getting and setting the driver data using platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev, so we can directly pass a struct platform_device.

---
  .../net/ethernet/freescale/fs_enet/fs_enet-main.c  |    1 -
  1 files changed, 0 insertions(+), 1 deletions(-)
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +0 -0
index 8de53a1..7e3de10 100644

drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c static int fs_enet_remove(struct platform_device *ofdev) · line 1127

Quoted 7 lines
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +0 -1
@@ -1122,7 +1122,6 @@ static int fs_enet_remove(struct platform_device *ofdev)
 
  	fep->ops->free_bd(ndev);
  	fep->ops->cleanup_data(ndev);
-	dev_set_drvdata(fep->dev, NULL);
  	of_node_put(fep->fpi->phy_node);
  	free_netdev(ndev);
  	return 0;

Changelog simply doesn't match the patch.

WBR, Sergei

author
#2 lore raw

PATCH RESEND 4/8 net: fs_enet: remove unnecessary dev_set_drvdata()

In reply to Libo Chen

unnecessary dev_set_drvdata() is removed, because the driver core clears the driver data to NULL after device_release or on probe failure.

---
 drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c  |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +0 -1
index 8de53a1..7e3de10 100644
@@ -1122,7 +1122,6 @@ static int fs_enet_remove(struct platform_device *ofdev)
 
 	fep->ops->free_bd(ndev);
 	fep->ops->cleanup_data(ndev);
-	dev_set_drvdata(fep->dev, NULL);
 	of_node_put(fep->fpi->phy_node);
 	free_netdev(ndev);
 	return 0;
Signature · 1 line
1.7.1