* [PATCH 0/9] net: simplify getting .driver_data
@ 2018-10-21 20:00 Wolfram Sang
2018-10-21 20:00 ` [PATCH 9/9] net: phy: mdio-mux-bcm-iproc: " Wolfram Sang
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Wolfram Sang @ 2018-10-21 20:00 UTC (permalink / raw)
To: linux-arm-kernel
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] 6+ 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
@ 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
2 siblings, 2 replies; 6+ messages in thread
From: Wolfram Sang @ 2018-10-21 20:00 UTC (permalink / raw)
To: 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] 6+ messages in thread
* [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; 6+ messages in thread
From: Andrew Lunn @ 2018-10-21 23:14 UTC (permalink / raw)
To: 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] 6+ messages in thread
* [PATCH 0/9] net: 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 9/9] net: phy: mdio-mux-bcm-iproc: " Wolfram Sang
@ 2018-10-22 4:11 ` David Miller
2018-10-22 17:05 ` Florian Fainelli
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2018-10-22 4:11 UTC (permalink / raw)
To: linux-arm-kernel
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] 6+ messages in thread
* [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; 6+ messages in thread
From: Florian Fainelli @ 2018-10-22 17:02 UTC (permalink / raw)
To: 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] 6+ messages in thread
* [PATCH 0/9] net: 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 9/9] net: phy: mdio-mux-bcm-iproc: " Wolfram Sang
2018-10-22 4:11 ` [PATCH 0/9] net: " David Miller
@ 2018-10-22 17:05 ` Florian Fainelli
2 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2018-10-22 17:05 UTC (permalink / raw)
To: linux-arm-kernel
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] 6+ messages in thread
end of thread, other threads:[~2018-10-22 17:05 UTC | newest]
Thread overview: 6+ 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 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).