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

PATCH Superseded Libo Chen 4 participants 7 messages Aug 12, 2013 – Aug 14, 2013

Subsystems (3)

Networking Network drivers TI Ethernet switch driver (cpsw)

lore

Share & tools

lore

Libo Chen

author

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

PATCH 8/8 net: davinci_mdio: 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/ti/davinci_mdio.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

drivers/net/ethernet/ti/davinci_mdio.c +1 -3

index 16ddfc3..2249b2c 100644
@@ -421,8 +421,7 @@ bail_out:
 
 static int davinci_mdio_remove(struct platform_device *pdev)
 {
-	struct device *dev = &pdev->dev;
-	struct davinci_mdio_data *data = dev_get_drvdata(dev);
+	struct davinci_mdio_data *data = platform_get_drvdata(pdev);
 
 	if (data->bus) {
 		mdiobus_unregister(data->bus);

@@ -434,7 +433,6 @@ static int davinci_mdio_remove(struct platform_device *pdev)
 	pm_runtime_put_sync(&pdev->dev);
 	pm_runtime_disable(&pdev->dev);
 
-	dev_set_drvdata(dev, NULL);
 
 	kfree(data);

Signature · 1 line

1.7.1

Mugunthan V N

Acked-by on v1 8/8

2013-08-12 16:53 UTC #1 lore raw

Quoted 5 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]>

Looks good.

Acked-by Mugunthan V N <[email protected]>

Regards
Mugunthan V N

Sergei Shtylyov

2013-08-12 18:17 UTC #2 lore raw

In reply to Libo Chen

Quoted 13 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/ti/davinci_mdio.c |    4 +---
  1 files changed, 1 insertions(+), 3 deletions(-)
drivers/net/ethernet/ti/davinci_mdio.c +0 -0
index 16ddfc3..2249b2c 100644

[...]

drivers/net/ethernet/ti/davinci_mdio.c static int davinci_mdio_remove(struct platform_device *pdev) · line 437

Quoted 5 lines

drivers/net/ethernet/ti/davinci_mdio.c +0 -1

@@ -434,7 +433,6 @@ static int davinci_mdio_remove(struct platform_device *pdev)
  	pm_runtime_put_sync(&pdev->dev);
  	pm_runtime_disable(&pdev->dev);
 
-	dev_set_drvdata(dev, NULL);

Doesn't get described as well. I think you're mixing two types of changes
in one patchset.

WBR, Sergei

David Miller

maintainer

2013-08-12 19:58 UTC #3 lore raw

From: Sergei Shtylyov <[email protected]>
Date: Mon, 12 Aug 2013 22:17:47 +0400

Quoted 2 lines

Doesn't get described as well. I think you're mixing two types of changes in one patchset.

Agreed, you're going to have to redo this entire patch set.

Libo Chen

author

2013-08-13 01:22 UTC #4 lore raw

Quoted 8 lines · David Miller

From: Sergei Shtylyov <[email protected]>
Date: Mon, 12 Aug 2013 22:17:47 +0400
Quoted 2 lines
Doesn't get described as well. I think you're mixing two types of changes in one patchset.
Agreed, you're going to have to redo this entire patch set.

okay, I will redo!

Libo Chen

author

2013-08-13 01:23 UTC #5 lore raw

In reply to Sergei Shtylyov

Quoted 20 lines · Sergei Shtylyov

Quoted 13 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/ti/davinci_mdio.c |    4 +---
  1 files changed, 1 insertions(+), 3 deletions(-)
drivers/net/ethernet/ti/davinci_mdio.c +0 -0
index 16ddfc3..2249b2c 100644
[...]
Quoted 4 lines
drivers/net/ethernet/ti/davinci_mdio.c +0 -0
@@ -434,7 +433,6 @@ static int davinci_mdio_remove(struct platform_device *pdev)
      pm_runtime_put_sync(&pdev->dev);
      pm_runtime_disable(&pdev->dev);
 

Quoted 6 lines

drivers/net/ethernet/ti/davinci_mdio.c static int davinci_mdio_remove(struct platform_device *pdev) · line 437
Quoted 1 line
drivers/net/ethernet/ti/davinci_mdio.c +0 -1
-    dev_set_drvdata(dev, NULL);
Doesn't get described as well. I think you're mixing two types of changes in one patchset.
WBR, Sergei

thanks for your attention!

Libo

Quoted 2 lines

Libo Chen

author

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

PATCH RESEND 8/8 net: davinci_mdio: 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 &pdev->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.

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

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

drivers/net/ethernet/ti/davinci_mdio.c +1 -3

index 16ddfc3..2249b2c 100644
@@ -421,8 +421,7 @@ bail_out:
 
 static int davinci_mdio_remove(struct platform_device *pdev)
 {
-	struct device *dev = &pdev->dev;
-	struct davinci_mdio_data *data = dev_get_drvdata(dev);
+	struct davinci_mdio_data *data = platform_get_drvdata(pdev);
 
 	if (data->bus) {
 		mdiobus_unregister(data->bus);

@@ -434,7 +433,6 @@ static int davinci_mdio_remove(struct platform_device *pdev)
 	pm_runtime_put_sync(&pdev->dev);
 	pm_runtime_disable(&pdev->dev);
 
-	dev_set_drvdata(dev, NULL);
 
 	kfree(data);

Signature · 1 line

1.7.1