Re: [PATCH 31/61] net: dsa: simplify getting .drvdata

2018-04-26 Thread Florian Fainelli
On 04/19/2018 07:06 AM, Wolfram Sang wrote:
> We should get drvdata from struct device directly. Going via
> platform_device is an unneeded step back and forth.
> 
> Signed-off-by: Wolfram Sang 
> ---
> 
> Build tested only. buildbot is happy. Please apply individually.

Similar to my other comment on patch 4, would not you want to use
dev_set_drvdata() to be consistent? This would be functionally equivalent.
--
Florian


[PATCH 31/61] net: dsa: simplify getting .drvdata

2018-04-19 Thread Wolfram Sang
We should get drvdata from struct device directly. Going via
platform_device is an unneeded step back and forth.

Signed-off-by: Wolfram Sang 
---

Build tested only. buildbot is happy. Please apply individually.

 drivers/net/dsa/bcm_sf2.c | 6 ++
 drivers/net/dsa/qca8k.c   | 6 ++
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 0378eded31f2..a61b937d1a37 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -1148,16 +1148,14 @@ static void bcm_sf2_sw_shutdown(struct platform_device 
*pdev)
 #ifdef CONFIG_PM_SLEEP
 static int bcm_sf2_suspend(struct device *dev)
 {
-   struct platform_device *pdev = to_platform_device(dev);
-   struct bcm_sf2_priv *priv = platform_get_drvdata(pdev);
+   struct bcm_sf2_priv *priv = dev_get_drvdata(dev);
 
return dsa_switch_suspend(priv->dev->ds);
 }
 
 static int bcm_sf2_resume(struct device *dev)
 {
-   struct platform_device *pdev = to_platform_device(dev);
-   struct bcm_sf2_priv *priv = platform_get_drvdata(pdev);
+   struct bcm_sf2_priv *priv = dev_get_drvdata(dev);
 
return dsa_switch_resume(priv->dev->ds);
 }
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index 600d5ad1fbde..9f503e5db88a 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -910,8 +910,7 @@ qca8k_set_pm(struct qca8k_priv *priv, int enable)
 
 static int qca8k_suspend(struct device *dev)
 {
-   struct platform_device *pdev = to_platform_device(dev);
-   struct qca8k_priv *priv = platform_get_drvdata(pdev);
+   struct qca8k_priv *priv = dev_get_drvdata(dev);
 
qca8k_set_pm(priv, 0);
 
@@ -920,8 +919,7 @@ static int qca8k_suspend(struct device *dev)
 
 static int qca8k_resume(struct device *dev)
 {
-   struct platform_device *pdev = to_platform_device(dev);
-   struct qca8k_priv *priv = platform_get_drvdata(pdev);
+   struct qca8k_priv *priv = dev_get_drvdata(dev);
 
qca8k_set_pm(priv, 1);
 
-- 
2.11.0