Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8513fbd8 authored by Jingoo Han's avatar Jingoo Han Committed by David S. Miller
Browse files

net: ethernet: use platform_{get,set}_drvdata() 



Use the wrapper functions for getting and setting the driver data using
platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
so we can directly pass a struct platform_device.

Also, unnecessary dev_set_drvdata() is removed, because the driver core
clears the driver data to NULL after device_release or on probe failure.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d0bfe22

drivers/net/ethernet/aeroflex/greth.c

+1 −3
Original line number Diff line number Diff line
@@ -1565,7 +1565,7 @@ static int greth_of_probe(struct platform_device *ofdev) 


static int greth_of_remove(struct platform_device *of_dev)

{

	struct net_device *ndev = dev_get_drvdata(&of_dev->dev);

	struct net_device *ndev = platform_get_drvdata(of_dev);

	struct greth_private *greth = netdev_priv(ndev);



	/* Free descriptor areas */
@@ -1573,8 +1573,6 @@ static int greth_of_remove(struct platform_device *of_dev) 


	dma_free_coherent(&of_dev->dev, 1024, greth->tx_bd_base, greth->tx_bd_base_phys);



	dev_set_drvdata(&of_dev->dev, NULL);



	if (greth->phy)

		phy_stop(greth->phy);

	mdiobus_unregister(greth->mdio);

drivers/net/ethernet/amd/sunlance.c

+2 −4
Original line number Diff line number Diff line
@@ -1470,7 +1470,7 @@ static int sparc_lance_probe_one(struct platform_device *op, 
		goto fail;

	}



	dev_set_drvdata(&op->dev, lp);

	platform_set_drvdata(op, lp);



	printk(KERN_INFO "%s: LANCE %pM\n",

	       dev->name, dev->dev_addr);
@@ -1501,7 +1501,7 @@ static int sunlance_sbus_probe(struct platform_device *op) 


static int sunlance_sbus_remove(struct platform_device *op)

{

	struct lance_private *lp = dev_get_drvdata(&op->dev);

	struct lance_private *lp = platform_get_drvdata(op);

	struct net_device *net_dev = lp->dev;



	unregister_netdev(net_dev);
@@ -1510,8 +1510,6 @@ static int sunlance_sbus_remove(struct platform_device *op) 


	free_netdev(net_dev);



	dev_set_drvdata(&op->dev, NULL);



	return 0;

}

drivers/net/ethernet/broadcom/sb1250-mac.c

+4 −5
Original line number Diff line number Diff line
@@ -2197,7 +2197,7 @@ static const struct net_device_ops sbmac_netdev_ops = { 


static int sbmac_init(struct platform_device *pldev, long long base)

{

	struct net_device *dev = dev_get_drvdata(&pldev->dev);

	struct net_device *dev = platform_get_drvdata(pldev);

	int idx = pldev->id;

	struct sbmac_softc *sc = netdev_priv(dev);

	unsigned char *eaddr;
@@ -2275,7 +2275,7 @@ static int sbmac_init(struct platform_device *pldev, long long base) 
		       dev->name);

		goto free_mdio;

	}

	dev_set_drvdata(&pldev->dev, sc->mii_bus);

	platform_set_drvdata(pldev, sc->mii_bus);



	err = register_netdev(dev);

	if (err) {
@@ -2300,7 +2300,6 @@ static int sbmac_init(struct platform_device *pldev, long long base) 
	return 0;

unreg_mdio:

	mdiobus_unregister(sc->mii_bus);

	dev_set_drvdata(&pldev->dev, NULL);

free_mdio:

	mdiobus_free(sc->mii_bus);

uninit_ctx:
@@ -2624,7 +2623,7 @@ static int sbmac_probe(struct platform_device *pldev) 
		goto out_unmap;

	}



	dev_set_drvdata(&pldev->dev, dev);

	platform_set_drvdata(pldev, dev);

	SET_NETDEV_DEV(dev, &pldev->dev);



	sc = netdev_priv(dev);
@@ -2649,7 +2648,7 @@ static int sbmac_probe(struct platform_device *pldev) 


static int __exit sbmac_remove(struct platform_device *pldev)

{

	struct net_device *dev = dev_get_drvdata(&pldev->dev);

	struct net_device *dev = platform_get_drvdata(pldev);

	struct sbmac_softc *sc = netdev_priv(dev);



	unregister_netdev(dev);

drivers/net/ethernet/freescale/fec_mpc52xx.c

+4 −5
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ static int mpc52xx_fec_probe(struct platform_device *op) 
		goto err_node;



	/* We're done ! */

	dev_set_drvdata(&op->dev, ndev);

	platform_set_drvdata(op, ndev);

	netdev_info(ndev, "%s MAC %pM\n",

		    op->dev.of_node->full_name, ndev->dev_addr);
@@ -1010,7 +1010,7 @@ mpc52xx_fec_remove(struct platform_device *op) 
	struct net_device *ndev;

	struct mpc52xx_fec_priv *priv;



	ndev = dev_get_drvdata(&op->dev);

	ndev = platform_get_drvdata(op);

	priv = netdev_priv(ndev);



	unregister_netdev(ndev);
@@ -1030,14 +1030,13 @@ mpc52xx_fec_remove(struct platform_device *op) 


	free_netdev(ndev);



	dev_set_drvdata(&op->dev, NULL);

	return 0;

}



#ifdef CONFIG_PM

static int mpc52xx_fec_of_suspend(struct platform_device *op, pm_message_t state)

{

	struct net_device *dev = dev_get_drvdata(&op->dev);

	struct net_device *dev = platform_get_drvdata(op);



	if (netif_running(dev))

		mpc52xx_fec_close(dev);
@@ -1047,7 +1046,7 @@ static int mpc52xx_fec_of_suspend(struct platform_device *op, pm_message_t state 


static int mpc52xx_fec_of_resume(struct platform_device *op)

{

	struct net_device *dev = dev_get_drvdata(&op->dev);

	struct net_device *dev = platform_get_drvdata(op);



	mpc52xx_fec_hw_init(dev);

	mpc52xx_fec_reset_stats(dev);

drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c

+2 −3
Original line number Diff line number Diff line
@@ -1048,7 +1048,7 @@ static int fs_enet_probe(struct platform_device *ofdev) 
	}



	SET_NETDEV_DEV(ndev, &ofdev->dev);

	dev_set_drvdata(&ofdev->dev, ndev);

	platform_set_drvdata(ofdev, ndev);



	fep = netdev_priv(ndev);

	fep->dev = &ofdev->dev;
@@ -1106,7 +1106,6 @@ static int fs_enet_probe(struct platform_device *ofdev) 
	fep->ops->cleanup_data(ndev);

out_free_dev:

	free_netdev(ndev);

	dev_set_drvdata(&ofdev->dev, NULL);

out_put:

	of_node_put(fpi->phy_node);

out_free_fpi:
@@ -1116,7 +1115,7 @@ static int fs_enet_probe(struct platform_device *ofdev) 


static int fs_enet_remove(struct platform_device *ofdev)

{

	struct net_device *ndev = dev_get_drvdata(&ofdev->dev);

	struct net_device *ndev = platform_get_drvdata(ofdev);

	struct fs_enet_private *fep = netdev_priv(ndev);



	unregister_netdev(ndev);