linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/9] net: simplify getting .driver_data
@ 2018-10-21 20:00 Wolfram Sang
  2018-10-21 20:00 ` [PATCH 1/9] net: dsa: bcm_sf2: " Wolfram Sang
                   ` (10 more replies)
  0 siblings, 11 replies; 18+ messages in thread
From: Wolfram Sang @ 2018-10-21 20:00 UTC (permalink / raw)
  To: linux-kernel
  Cc: linux-renesas-soc, Wolfram Sang, linux-arm-kernel, linux-omap, netdev

I got tired of fixing this in Renesas drivers manually, so I took the big
hammer. Remove this cumbersome code pattern which got copy-pasted too much
already:

-	struct platform_device *pdev = to_platform_device(dev);
-	struct ep93xx_keypad *keypad = platform_get_drvdata(pdev);
+	struct ep93xx_keypad *keypad = dev_get_drvdata(dev);

A branch, tested by buildbot, can be found here:

git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git coccinelle/get_drvdata

I have been asked if it couldn't be done for dev_set_drvdata as well. I checked
it and did not find one occasion where it could be simplified like this. Not
much of a surprise because driver_data is usually set in probe() functions
which access struct platform_device in many other ways.

I am open for other comments, suggestions, too, of course.

Here is the cocci-script I created:

@@
struct device* d;
identifier pdev;
expression *ptr;
@@
(
-	struct platform_device *pdev = to_platform_device(d);
|
-	struct platform_device *pdev;
	...
-	pdev = to_platform_device(d);
)
	<... when != pdev
-	&pdev->dev
+	d
	...>

	ptr =
-	platform_get_drvdata(pdev)
+	dev_get_drvdata(d)

	<... when != pdev
-	&pdev->dev
+	d
	...>

Kind regards,

   Wolfram


Wolfram Sang (9):
  net: dsa: bcm_sf2: simplify getting .driver_data
  net: dsa: qca8k: simplify getting .driver_data
  net: ethernet: cadence: macb_main: simplify getting .driver_data
  net: ethernet: davicom: dm9000: simplify getting .driver_data
  net: ethernet: smsc: smc91x: simplify getting .driver_data
  net: ethernet: ti: cpsw: simplify getting .driver_data
  net: ethernet: ti: davinci_emac: simplify getting .driver_data
  net: ethernet: wiznet: w5300: simplify getting .driver_data
  net: phy: mdio-mux-bcm-iproc: simplify getting .driver_data

 drivers/net/dsa/bcm_sf2.c                | 6 ++----
 drivers/net/dsa/qca8k.c                  | 6 ++----
 drivers/net/ethernet/cadence/macb_main.c | 6 ++----
 drivers/net/ethernet/davicom/dm9000.c    | 6 ++----
 drivers/net/ethernet/smsc/smc91x.c       | 3 +--
 drivers/net/ethernet/ti/cpsw.c           | 6 ++----
 drivers/net/ethernet/ti/davinci_emac.c   | 6 ++----
 drivers/net/ethernet/wiznet/w5300.c      | 6 ++----
 drivers/net/phy/mdio-mux-bcm-iproc.c     | 6 ++----
 9 files changed, 17 insertions(+), 34 deletions(-)

-- 
2.19.0


^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH 1/9] net: dsa: bcm_sf2: simplify getting .driver_data
  2018-10-21 20:00 [PATCH 0/9] net: simplify getting .driver_data Wolfram Sang
@ 2018-10-21 20:00 ` Wolfram Sang
  2018-10-21 23:16   ` Andrew Lunn
  2018-10-22 17:01   ` Florian Fainelli
  2018-10-21 20:00 ` [PATCH 2/9] net: dsa: qca8k: " Wolfram Sang
                   ` (9 subsequent siblings)
  10 siblings, 2 replies; 18+ messages in thread
From: Wolfram Sang @ 2018-10-21 20:00 UTC (permalink / raw)
  To: linux-kernel
  Cc: linux-renesas-soc, Wolfram Sang, Andrew Lunn, Vivien Didelot,
	Florian Fainelli, David S. Miller, netdev

We should get 'driver_data' from 'struct device' directly. Going via
platform_device is an unneeded step back and forth.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Build tested only. buildbot is happy.

 drivers/net/dsa/bcm_sf2.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 3017ecf82ca5..2eb68769562c 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -1190,16 +1190,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);
 }
-- 
2.19.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 2/9] net: dsa: qca8k: simplify getting .driver_data
  2018-10-21 20:00 [PATCH 0/9] net: simplify getting .driver_data Wolfram Sang
  2018-10-21 20:00 ` [PATCH 1/9] net: dsa: bcm_sf2: " Wolfram Sang
@ 2018-10-21 20:00 ` Wolfram Sang
  2018-10-21 23:15   ` Andrew Lunn
  2018-10-22 17:01   ` Florian Fainelli
  2018-10-21 20:00 ` [PATCH 3/9] net: ethernet: cadence: macb_main: " Wolfram Sang
                   ` (8 subsequent siblings)
  10 siblings, 2 replies; 18+ messages in thread
From: Wolfram Sang @ 2018-10-21 20:00 UTC (permalink / raw)
  To: linux-kernel
  Cc: linux-renesas-soc, Wolfram Sang, Andrew Lunn, Vivien Didelot,
	Florian Fainelli, David S. Miller, netdev

We should get 'driver_data' from 'struct device' directly. Going via
platform_device is an unneeded step back and forth.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Build tested only. buildbot is happy.

 drivers/net/dsa/qca8k.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index cdcde7f8e0b2..7e97e620bd44 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -955,8 +955,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);
 
@@ -965,8 +964,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.19.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 3/9] net: ethernet: cadence: macb_main: simplify getting .driver_data
  2018-10-21 20:00 [PATCH 0/9] net: simplify getting .driver_data Wolfram Sang
  2018-10-21 20:00 ` [PATCH 1/9] net: dsa: bcm_sf2: " Wolfram Sang
  2018-10-21 20:00 ` [PATCH 2/9] net: dsa: qca8k: " Wolfram Sang
@ 2018-10-21 20:00 ` Wolfram Sang
  2018-10-21 20:00 ` [PATCH 4/9] net: ethernet: davicom: dm9000: " Wolfram Sang
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 18+ messages in thread
From: Wolfram Sang @ 2018-10-21 20:00 UTC (permalink / raw)
  To: linux-kernel
  Cc: linux-renesas-soc, Wolfram Sang, Nicolas Ferre, David S. Miller, netdev

We should get 'driver_data' from 'struct device' directly. Going via
platform_device is an unneeded step back and forth.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Build tested only. buildbot is happy.

 drivers/net/ethernet/cadence/macb_main.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 0acaef3ef548..8f5bf9166c11 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -4156,8 +4156,7 @@ static int macb_remove(struct platform_device *pdev)
 
 static int __maybe_unused macb_suspend(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct net_device *netdev = platform_get_drvdata(pdev);
+	struct net_device *netdev = dev_get_drvdata(dev);
 	struct macb *bp = netdev_priv(netdev);
 
 	netif_carrier_off(netdev);
@@ -4179,8 +4178,7 @@ static int __maybe_unused macb_suspend(struct device *dev)
 
 static int __maybe_unused macb_resume(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct net_device *netdev = platform_get_drvdata(pdev);
+	struct net_device *netdev = dev_get_drvdata(dev);
 	struct macb *bp = netdev_priv(netdev);
 
 	if (bp->wol & MACB_WOL_ENABLED) {
-- 
2.19.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 4/9] net: ethernet: davicom: dm9000: simplify getting .driver_data
  2018-10-21 20:00 [PATCH 0/9] net: simplify getting .driver_data Wolfram Sang
                   ` (2 preceding siblings ...)
  2018-10-21 20:00 ` [PATCH 3/9] net: ethernet: cadence: macb_main: " Wolfram Sang
@ 2018-10-21 20:00 ` Wolfram Sang
  2018-10-21 20:00 ` [PATCH 5/9] net: ethernet: smsc: smc91x: " Wolfram Sang
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 18+ messages in thread
From: Wolfram Sang @ 2018-10-21 20:00 UTC (permalink / raw)
  To: linux-kernel; +Cc: linux-renesas-soc, Wolfram Sang, David S. Miller, netdev

We should get 'driver_data' from 'struct device' directly. Going via
platform_device is an unneeded step back and forth.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Build tested only. buildbot is happy.

 drivers/net/ethernet/davicom/dm9000.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
index 50222b7b81f3..0a82fcf16d35 100644
--- a/drivers/net/ethernet/davicom/dm9000.c
+++ b/drivers/net/ethernet/davicom/dm9000.c
@@ -1722,8 +1722,7 @@ dm9000_probe(struct platform_device *pdev)
 static int
 dm9000_drv_suspend(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct net_device *ndev = platform_get_drvdata(pdev);
+	struct net_device *ndev = dev_get_drvdata(dev);
 	struct board_info *db;
 
 	if (ndev) {
@@ -1745,8 +1744,7 @@ dm9000_drv_suspend(struct device *dev)
 static int
 dm9000_drv_resume(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct net_device *ndev = platform_get_drvdata(pdev);
+	struct net_device *ndev = dev_get_drvdata(dev);
 	struct board_info *db = netdev_priv(ndev);
 
 	if (ndev) {
-- 
2.19.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 5/9] net: ethernet: smsc: smc91x: simplify getting .driver_data
  2018-10-21 20:00 [PATCH 0/9] net: simplify getting .driver_data Wolfram Sang
                   ` (3 preceding siblings ...)
  2018-10-21 20:00 ` [PATCH 4/9] net: ethernet: davicom: dm9000: " Wolfram Sang
@ 2018-10-21 20:00 ` Wolfram Sang
  2018-10-21 20:00 ` [PATCH 6/9] net: ethernet: ti: cpsw: " Wolfram Sang
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 18+ messages in thread
From: Wolfram Sang @ 2018-10-21 20:00 UTC (permalink / raw)
  To: linux-kernel
  Cc: linux-renesas-soc, Wolfram Sang, Nicolas Pitre, David S. Miller, netdev

We should get 'driver_data' from 'struct device' directly. Going via
platform_device is an unneeded step back and forth.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Build tested only. buildbot is happy.

 drivers/net/ethernet/smsc/smc91x.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 8d6cff8bd162..4823b6a51134 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -2447,8 +2447,7 @@ static int smc_drv_remove(struct platform_device *pdev)
 
 static int smc_drv_suspend(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct net_device *ndev = platform_get_drvdata(pdev);
+	struct net_device *ndev = dev_get_drvdata(dev);
 
 	if (ndev) {
 		if (netif_running(ndev)) {
-- 
2.19.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 6/9] net: ethernet: ti: cpsw: simplify getting .driver_data
  2018-10-21 20:00 [PATCH 0/9] net: simplify getting .driver_data Wolfram Sang
                   ` (4 preceding siblings ...)
  2018-10-21 20:00 ` [PATCH 5/9] net: ethernet: smsc: smc91x: " Wolfram Sang
@ 2018-10-21 20:00 ` Wolfram Sang
  2018-10-21 20:00 ` [PATCH 7/9] net: ethernet: ti: davinci_emac: " Wolfram Sang
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 18+ messages in thread
From: Wolfram Sang @ 2018-10-21 20:00 UTC (permalink / raw)
  To: linux-kernel
  Cc: linux-renesas-soc, Wolfram Sang, Grygorii Strashko,
	David S. Miller, linux-omap, netdev

We should get 'driver_data' from 'struct device' directly. Going via
platform_device is an unneeded step back and forth.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Build tested only. buildbot is happy.

 drivers/net/ethernet/ti/cpsw.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 16dcbf36f8cc..4753ae7178fb 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -3658,8 +3658,7 @@ static int cpsw_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM_SLEEP
 static int cpsw_suspend(struct device *dev)
 {
-	struct platform_device	*pdev = to_platform_device(dev);
-	struct net_device	*ndev = platform_get_drvdata(pdev);
+	struct net_device	*ndev = dev_get_drvdata(dev);
 	struct cpsw_common	*cpsw = ndev_to_cpsw(ndev);
 
 	if (cpsw->data.dual_emac) {
@@ -3682,8 +3681,7 @@ static int cpsw_suspend(struct device *dev)
 
 static int cpsw_resume(struct device *dev)
 {
-	struct platform_device	*pdev = to_platform_device(dev);
-	struct net_device	*ndev = platform_get_drvdata(pdev);
+	struct net_device	*ndev = dev_get_drvdata(dev);
 	struct cpsw_common	*cpsw = ndev_to_cpsw(ndev);
 
 	/* Select default pin state */
-- 
2.19.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 7/9] net: ethernet: ti: davinci_emac: simplify getting .driver_data
  2018-10-21 20:00 [PATCH 0/9] net: simplify getting .driver_data Wolfram Sang
                   ` (5 preceding siblings ...)
  2018-10-21 20:00 ` [PATCH 6/9] net: ethernet: ti: cpsw: " Wolfram Sang
@ 2018-10-21 20:00 ` Wolfram Sang
  2018-10-21 20:00 ` [PATCH 8/9] net: ethernet: wiznet: w5300: " Wolfram Sang
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 18+ messages in thread
From: Wolfram Sang @ 2018-10-21 20:00 UTC (permalink / raw)
  To: linux-kernel
  Cc: linux-renesas-soc, Wolfram Sang, Grygorii Strashko,
	David S. Miller, linux-omap, netdev

We should get 'driver_data' from 'struct device' directly. Going via
platform_device is an unneeded step back and forth.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Build tested only. buildbot is happy.

 drivers/net/ethernet/ti/davinci_emac.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index f270beebb428..9153db120352 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -2002,8 +2002,7 @@ static int davinci_emac_remove(struct platform_device *pdev)
 
 static int davinci_emac_suspend(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct net_device *ndev = platform_get_drvdata(pdev);
+	struct net_device *ndev = dev_get_drvdata(dev);
 
 	if (netif_running(ndev))
 		emac_dev_stop(ndev);
@@ -2013,8 +2012,7 @@ static int davinci_emac_suspend(struct device *dev)
 
 static int davinci_emac_resume(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct net_device *ndev = platform_get_drvdata(pdev);
+	struct net_device *ndev = dev_get_drvdata(dev);
 
 	if (netif_running(ndev))
 		emac_dev_open(ndev);
-- 
2.19.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 8/9] net: ethernet: wiznet: w5300: simplify getting .driver_data
  2018-10-21 20:00 [PATCH 0/9] net: simplify getting .driver_data Wolfram Sang
                   ` (6 preceding siblings ...)
  2018-10-21 20:00 ` [PATCH 7/9] net: ethernet: ti: davinci_emac: " Wolfram Sang
@ 2018-10-21 20:00 ` Wolfram Sang
  2018-10-21 20:00 ` [PATCH 9/9] net: phy: mdio-mux-bcm-iproc: " Wolfram Sang
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 18+ messages in thread
From: Wolfram Sang @ 2018-10-21 20:00 UTC (permalink / raw)
  To: linux-kernel; +Cc: linux-renesas-soc, Wolfram Sang, David S. Miller, netdev

We should get 'driver_data' from 'struct device' directly. Going via
platform_device is an unneeded step back and forth.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Build tested only. buildbot is happy.

 drivers/net/ethernet/wiznet/w5300.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c
index 80fdbff67d82..f9da5d6172e3 100644
--- a/drivers/net/ethernet/wiznet/w5300.c
+++ b/drivers/net/ethernet/wiznet/w5300.c
@@ -661,8 +661,7 @@ static int w5300_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM_SLEEP
 static int w5300_suspend(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct net_device *ndev = platform_get_drvdata(pdev);
+	struct net_device *ndev = dev_get_drvdata(dev);
 	struct w5300_priv *priv = netdev_priv(ndev);
 
 	if (netif_running(ndev)) {
@@ -676,8 +675,7 @@ static int w5300_suspend(struct device *dev)
 
 static int w5300_resume(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct net_device *ndev = platform_get_drvdata(pdev);
+	struct net_device *ndev = dev_get_drvdata(dev);
 	struct w5300_priv *priv = netdev_priv(ndev);
 
 	if (!netif_running(ndev)) {
-- 
2.19.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 9/9] net: phy: mdio-mux-bcm-iproc: simplify getting .driver_data
  2018-10-21 20:00 [PATCH 0/9] net: simplify getting .driver_data Wolfram Sang
                   ` (7 preceding siblings ...)
  2018-10-21 20:00 ` [PATCH 8/9] net: ethernet: wiznet: w5300: " Wolfram Sang
@ 2018-10-21 20:00 ` Wolfram Sang
  2018-10-21 23:14   ` Andrew Lunn
  2018-10-22 17:02   ` Florian Fainelli
  2018-10-22  4:11 ` [PATCH 0/9] net: " David Miller
  2018-10-22 17:05 ` Florian Fainelli
  10 siblings, 2 replies; 18+ messages in thread
From: Wolfram Sang @ 2018-10-21 20:00 UTC (permalink / raw)
  To: linux-kernel
  Cc: linux-renesas-soc, Wolfram Sang, Andrew Lunn, Florian Fainelli,
	David S. Miller, Ray Jui, Scott Branden, Jon Mason,
	bcm-kernel-feedback-list, netdev, linux-arm-kernel

We should get 'driver_data' from 'struct device' directly. Going via
platform_device is an unneeded step back and forth.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Build tested only. buildbot is happy.

 drivers/net/phy/mdio-mux-bcm-iproc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c
index c017486e9b86..696bdf1e4576 100644
--- a/drivers/net/phy/mdio-mux-bcm-iproc.c
+++ b/drivers/net/phy/mdio-mux-bcm-iproc.c
@@ -289,8 +289,7 @@ static int mdio_mux_iproc_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM_SLEEP
 static int mdio_mux_iproc_suspend(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct iproc_mdiomux_desc *md = platform_get_drvdata(pdev);
+	struct iproc_mdiomux_desc *md = dev_get_drvdata(dev);
 
 	clk_disable_unprepare(md->core_clk);
 
@@ -299,8 +298,7 @@ static int mdio_mux_iproc_suspend(struct device *dev)
 
 static int mdio_mux_iproc_resume(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct iproc_mdiomux_desc *md = platform_get_drvdata(pdev);
+	struct iproc_mdiomux_desc *md = dev_get_drvdata(dev);
 
 	clk_prepare_enable(md->core_clk);
 	mdio_mux_iproc_config(md);
-- 
2.19.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [PATCH 9/9] net: phy: mdio-mux-bcm-iproc: simplify getting .driver_data
  2018-10-21 20:00 ` [PATCH 9/9] net: phy: mdio-mux-bcm-iproc: " Wolfram Sang
@ 2018-10-21 23:14   ` Andrew Lunn
  2018-10-22 17:02   ` Florian Fainelli
  1 sibling, 0 replies; 18+ messages in thread
From: Andrew Lunn @ 2018-10-21 23:14 UTC (permalink / raw)
  To: Wolfram Sang
  Cc: linux-kernel, linux-renesas-soc, Florian Fainelli,
	David S. Miller, Ray Jui, Scott Branden, Jon Mason,
	bcm-kernel-feedback-list, netdev, linux-arm-kernel

On Sun, Oct 21, 2018 at 10:00:20PM +0200, Wolfram Sang wrote:
> We should get 'driver_data' from 'struct device' directly. Going via
> platform_device is an unneeded step back and forth.
> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 2/9] net: dsa: qca8k: simplify getting .driver_data
  2018-10-21 20:00 ` [PATCH 2/9] net: dsa: qca8k: " Wolfram Sang
@ 2018-10-21 23:15   ` Andrew Lunn
  2018-10-22 17:01   ` Florian Fainelli
  1 sibling, 0 replies; 18+ messages in thread
From: Andrew Lunn @ 2018-10-21 23:15 UTC (permalink / raw)
  To: Wolfram Sang
  Cc: linux-kernel, linux-renesas-soc, Vivien Didelot,
	Florian Fainelli, David S. Miller, netdev

On Sun, Oct 21, 2018 at 10:00:13PM +0200, Wolfram Sang wrote:
> We should get 'driver_data' from 'struct device' directly. Going via
> platform_device is an unneeded step back and forth.
> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/9] net: dsa: bcm_sf2: simplify getting .driver_data
  2018-10-21 20:00 ` [PATCH 1/9] net: dsa: bcm_sf2: " Wolfram Sang
@ 2018-10-21 23:16   ` Andrew Lunn
  2018-10-22 17:01   ` Florian Fainelli
  1 sibling, 0 replies; 18+ messages in thread
From: Andrew Lunn @ 2018-10-21 23:16 UTC (permalink / raw)
  To: Wolfram Sang
  Cc: linux-kernel, linux-renesas-soc, Vivien Didelot,
	Florian Fainelli, David S. Miller, netdev

On Sun, Oct 21, 2018 at 10:00:12PM +0200, Wolfram Sang wrote:
> We should get 'driver_data' from 'struct device' directly. Going via
> platform_device is an unneeded step back and forth.
> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew


^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 0/9] net: simplify getting .driver_data
  2018-10-21 20:00 [PATCH 0/9] net: simplify getting .driver_data Wolfram Sang
                   ` (8 preceding siblings ...)
  2018-10-21 20:00 ` [PATCH 9/9] net: phy: mdio-mux-bcm-iproc: " Wolfram Sang
@ 2018-10-22  4:11 ` David Miller
  2018-10-22 17:05 ` Florian Fainelli
  10 siblings, 0 replies; 18+ messages in thread
From: David Miller @ 2018-10-22  4:11 UTC (permalink / raw)
  To: wsa+renesas
  Cc: linux-kernel, linux-renesas-soc, linux-arm-kernel, linux-omap, netdev

From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Date: Sun, 21 Oct 2018 22:00:11 +0200

> I got tired of fixing this in Renesas drivers manually, so I took the big
> hammer. Remove this cumbersome code pattern which got copy-pasted too much
> already:
> 
> -	struct platform_device *pdev = to_platform_device(dev);
> -	struct ep93xx_keypad *keypad = platform_get_drvdata(pdev);
> +	struct ep93xx_keypad *keypad = dev_get_drvdata(dev);
> 
> A branch, tested by buildbot, can be found here:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git coccinelle/get_drvdata
> 
> I have been asked if it couldn't be done for dev_set_drvdata as well. I checked
> it and did not find one occasion where it could be simplified like this. Not
> much of a surprise because driver_data is usually set in probe() functions
> which access struct platform_device in many other ways.
> 
> I am open for other comments, suggestions, too, of course.
> 
> Here is the cocci-script I created:
 ...

Series applied to net-next, thanks.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/9] net: dsa: bcm_sf2: simplify getting .driver_data
  2018-10-21 20:00 ` [PATCH 1/9] net: dsa: bcm_sf2: " Wolfram Sang
  2018-10-21 23:16   ` Andrew Lunn
@ 2018-10-22 17:01   ` Florian Fainelli
  1 sibling, 0 replies; 18+ messages in thread
From: Florian Fainelli @ 2018-10-22 17:01 UTC (permalink / raw)
  To: Wolfram Sang, linux-kernel
  Cc: linux-renesas-soc, Andrew Lunn, Vivien Didelot, David S. Miller, netdev

On 10/21/18 1:00 PM, Wolfram Sang wrote:
> We should get 'driver_data' from 'struct device' directly. Going via
> platform_device is an unneeded step back and forth.
> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 2/9] net: dsa: qca8k: simplify getting .driver_data
  2018-10-21 20:00 ` [PATCH 2/9] net: dsa: qca8k: " Wolfram Sang
  2018-10-21 23:15   ` Andrew Lunn
@ 2018-10-22 17:01   ` Florian Fainelli
  1 sibling, 0 replies; 18+ messages in thread
From: Florian Fainelli @ 2018-10-22 17:01 UTC (permalink / raw)
  To: Wolfram Sang, linux-kernel
  Cc: linux-renesas-soc, Andrew Lunn, Vivien Didelot, David S. Miller, netdev

On 10/21/18 1:00 PM, Wolfram Sang wrote:
> We should get 'driver_data' from 'struct device' directly. Going via
> platform_device is an unneeded step back and forth.
> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 9/9] net: phy: mdio-mux-bcm-iproc: simplify getting .driver_data
  2018-10-21 20:00 ` [PATCH 9/9] net: phy: mdio-mux-bcm-iproc: " Wolfram Sang
  2018-10-21 23:14   ` Andrew Lunn
@ 2018-10-22 17:02   ` Florian Fainelli
  1 sibling, 0 replies; 18+ messages in thread
From: Florian Fainelli @ 2018-10-22 17:02 UTC (permalink / raw)
  To: Wolfram Sang, linux-kernel
  Cc: linux-renesas-soc, Andrew Lunn, David S. Miller, Ray Jui,
	Scott Branden, Jon Mason, bcm-kernel-feedback-list, netdev,
	linux-arm-kernel

On 10/21/18 1:00 PM, Wolfram Sang wrote:
> We should get 'driver_data' from 'struct device' directly. Going via
> platform_device is an unneeded step back and forth.
> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 0/9] net: simplify getting .driver_data
  2018-10-21 20:00 [PATCH 0/9] net: simplify getting .driver_data Wolfram Sang
                   ` (9 preceding siblings ...)
  2018-10-22  4:11 ` [PATCH 0/9] net: " David Miller
@ 2018-10-22 17:05 ` Florian Fainelli
  10 siblings, 0 replies; 18+ messages in thread
From: Florian Fainelli @ 2018-10-22 17:05 UTC (permalink / raw)
  To: Wolfram Sang, linux-kernel
  Cc: linux-renesas-soc, linux-omap, linux-arm-kernel, netdev

On 10/21/18 1:00 PM, Wolfram Sang wrote:
> I got tired of fixing this in Renesas drivers manually, so I took the big
> hammer. Remove this cumbersome code pattern which got copy-pasted too much
> already:
> 
> -	struct platform_device *pdev = to_platform_device(dev);
> -	struct ep93xx_keypad *keypad = platform_get_drvdata(pdev);
> +	struct ep93xx_keypad *keypad = dev_get_drvdata(dev);
> 
> A branch, tested by buildbot, can be found here:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git coccinelle/get_drvdata
> 
> I have been asked if it couldn't be done for dev_set_drvdata as well. I checked
> it and did not find one occasion where it could be simplified like this. Not
> much of a surprise because driver_data is usually set in probe() functions
> which access struct platform_device in many other ways.
> 
> I am open for other comments, suggestions, too, of course.

Would it make sense to annotate platform_get_drvdata() with __deprecated
or something like that to prevent further uses by driver authors?

Do you mind submitting the cocci-script to the maintainers of the
coccinelle scripts that way it can be included and run by automated
tools? Thanks!

> 
> Here is the cocci-script I created:
> 
> @@
> struct device* d;
> identifier pdev;
> expression *ptr;
> @@
> (
> -	struct platform_device *pdev = to_platform_device(d);
> |
> -	struct platform_device *pdev;
> 	...
> -	pdev = to_platform_device(d);
> )
> 	<... when != pdev
> -	&pdev->dev
> +	d
> 	...>
> 
> 	ptr =
> -	platform_get_drvdata(pdev)
> +	dev_get_drvdata(d)
> 
> 	<... when != pdev
> -	&pdev->dev
> +	d
> 	...>
> 
> Kind regards,
> 
>    Wolfram
> 
> 
> Wolfram Sang (9):
>   net: dsa: bcm_sf2: simplify getting .driver_data
>   net: dsa: qca8k: simplify getting .driver_data
>   net: ethernet: cadence: macb_main: simplify getting .driver_data
>   net: ethernet: davicom: dm9000: simplify getting .driver_data
>   net: ethernet: smsc: smc91x: simplify getting .driver_data
>   net: ethernet: ti: cpsw: simplify getting .driver_data
>   net: ethernet: ti: davinci_emac: simplify getting .driver_data
>   net: ethernet: wiznet: w5300: simplify getting .driver_data
>   net: phy: mdio-mux-bcm-iproc: simplify getting .driver_data
> 
>  drivers/net/dsa/bcm_sf2.c                | 6 ++----
>  drivers/net/dsa/qca8k.c                  | 6 ++----
>  drivers/net/ethernet/cadence/macb_main.c | 6 ++----
>  drivers/net/ethernet/davicom/dm9000.c    | 6 ++----
>  drivers/net/ethernet/smsc/smc91x.c       | 3 +--
>  drivers/net/ethernet/ti/cpsw.c           | 6 ++----
>  drivers/net/ethernet/ti/davinci_emac.c   | 6 ++----
>  drivers/net/ethernet/wiznet/w5300.c      | 6 ++----
>  drivers/net/phy/mdio-mux-bcm-iproc.c     | 6 ++----
>  9 files changed, 17 insertions(+), 34 deletions(-)
> 


-- 
Florian

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2018-10-22 17:06 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-21 20:00 [PATCH 0/9] net: simplify getting .driver_data Wolfram Sang
2018-10-21 20:00 ` [PATCH 1/9] net: dsa: bcm_sf2: " Wolfram Sang
2018-10-21 23:16   ` Andrew Lunn
2018-10-22 17:01   ` Florian Fainelli
2018-10-21 20:00 ` [PATCH 2/9] net: dsa: qca8k: " Wolfram Sang
2018-10-21 23:15   ` Andrew Lunn
2018-10-22 17:01   ` Florian Fainelli
2018-10-21 20:00 ` [PATCH 3/9] net: ethernet: cadence: macb_main: " Wolfram Sang
2018-10-21 20:00 ` [PATCH 4/9] net: ethernet: davicom: dm9000: " Wolfram Sang
2018-10-21 20:00 ` [PATCH 5/9] net: ethernet: smsc: smc91x: " Wolfram Sang
2018-10-21 20:00 ` [PATCH 6/9] net: ethernet: ti: cpsw: " Wolfram Sang
2018-10-21 20:00 ` [PATCH 7/9] net: ethernet: ti: davinci_emac: " Wolfram Sang
2018-10-21 20:00 ` [PATCH 8/9] net: ethernet: wiznet: w5300: " Wolfram Sang
2018-10-21 20:00 ` [PATCH 9/9] net: phy: mdio-mux-bcm-iproc: " Wolfram Sang
2018-10-21 23:14   ` Andrew Lunn
2018-10-22 17:02   ` Florian Fainelli
2018-10-22  4:11 ` [PATCH 0/9] net: " David Miller
2018-10-22 17:05 ` Florian Fainelli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).