]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'net-simplify-getting-driver_data'
authorDavid S. Miller <davem@davemloft.net>
Mon, 22 Oct 2018 04:10:12 +0000 (21:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 22 Oct 2018 04:10:12 +0000 (21:10 -0700)
commit92303c86b7e9b7d3895ccafb441a0354143e2a18
tree0ac0480f6c4131437de72933de2adb0132d4be0c
parent21ea1d36f6dfcb1d59184937c672022d5d01902a
parent2c67e33de2d3f2350cff2e131f5aa8d7f1ff6f9f
Merge branch 'net-simplify-getting-driver_data'

Wolfram Sang says:

====================
net: simplify getting .driver_data

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
...>
====================

Signed-off-by: David S. Miller <davem@davemloft.net>