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

PATCH Superseded Libo Chen 2 participants 4 messages Aug 12, 2013 – Aug 19, 2013

Subsystems (3)

Networking Network drivers Arm/Zynq architecture

lore

Share & tools

lore

Libo Chen

author

2013-08-12 13:25 UTC #0 lore raw

PATCH 7/8 net: xilinx_emaclite: 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.

Signed-off-by Libo Chen <[email protected]>

---
 drivers/net/ethernet/xilinx/xilinx_emaclite.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

drivers/net/ethernet/xilinx/xilinx_emaclite.c +1 -3

index fd4dbda..4c619ea 100644
@@ -1230,8 +1230,7 @@ error:
  */
 static int xemaclite_of_remove(struct platform_device *of_dev)
 {
-	struct device *dev = &of_dev->dev;
-	struct net_device *ndev = dev_get_drvdata(dev);
+	struct net_device *ndev = platform_get_drvdata(of_dev);
 
 	struct net_local *lp = netdev_priv(ndev);

@@ -1250,7 +1249,6 @@ static int xemaclite_of_remove(struct platform_device *of_dev)
 	lp->phy_node = NULL;
 
 	xemaclite_remove_ndev(ndev, of_dev);
-	dev_set_drvdata(dev, NULL);
 
 	return 0;
 }

Signature · 1 line

1.7.1

Michal Simek

Acked-by on v1 7/8

2013-08-12 13:28 UTC #1 lore raw

Quoted 26 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.
Signed-off-by Libo Chen <[email protected]>
---
 drivers/net/ethernet/xilinx/xilinx_emaclite.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/net/ethernet/xilinx/xilinx_emaclite.c +1 -2
index fd4dbda..4c619ea 100644
@@ -1230,8 +1230,7 @@ error:
  */
 static int xemaclite_of_remove(struct platform_device *of_dev)
 {
-	struct device *dev = &of_dev->dev;
-	struct net_device *ndev = dev_get_drvdata(dev);
+	struct net_device *ndev = platform_get_drvdata(of_dev);
 
 	struct net_local *lp = netdev_priv(ndev);
 

drivers/net/ethernet/xilinx/xilinx_emaclite.c static int xemaclite_of_remove(struct platform_device *of_dev) · line 1254

Quoted 7 lines

drivers/net/ethernet/xilinx/xilinx_emaclite.c +0 -1

@@ -1250,7 +1249,6 @@ static int xemaclite_of_remove(struct platform_device *of_dev)
 	lp->phy_node = NULL;
 
 	xemaclite_remove_ndev(ndev, of_dev);
-	dev_set_drvdata(dev, NULL);
 
 	return 0;
 }

Acked-by Michal Simek <[email protected]>

Thanks,
Michal

Signature · 5 lines

Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform

Libo Chen

author

2013-08-14 03:40 UTC #2 lore raw

PATCH RESEND 7/8 net: xilinx_emaclite: use platform_{get,set}_drvdata()

In reply to Libo Chen

We can use the wrapper functions platform_{get,set}_drvdata() instead of dev_{get,set}_drvdata() with &of_dev->dev, it is convenient for user.

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