Commit 92303c86 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 21ea1d36 2c67e33d

drivers/net/dsa/bcm_sf2.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

}

drivers/net/dsa/qca8k.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/cadence/macb_main.c

+2 −4
Original line number Diff line number Diff line
@@ -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) {

drivers/net/ethernet/davicom/dm9000.c

+2 −4
Original line number Diff line number Diff line
@@ -1722,8 +1722,7 @@ out: 
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) {

drivers/net/ethernet/smsc/smc91x.c

+1 −2
Original line number Diff line number Diff line
@@ -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)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE