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

Commit bfe59032 authored by Ivan Khoronzhuk's avatar Ivan Khoronzhuk Committed by David S. Miller
Browse files

net: ethernet: ti: cpsw: use cpsw as drv data 



No need to set ndev for drvdata when mainly cpsw reference is needed,
so correct this legacy decision.

Reviewed-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarIvan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eea9e3a4

drivers/net/ethernet/ti/cpsw.c

+7 −9
Original line number Diff line number Diff line
@@ -2265,8 +2265,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, 


static void cpsw_remove_dt(struct platform_device *pdev)

{

	struct net_device *ndev = platform_get_drvdata(pdev);

	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);

	struct cpsw_common *cpsw = platform_get_drvdata(pdev);

	struct cpsw_platform_data *data = &cpsw->data;

	struct device_node *node = pdev->dev.of_node;

	struct device_node *slave_node;
@@ -2477,7 +2476,7 @@ static int cpsw_probe(struct platform_device *pdev) 
		goto clean_cpts;

	}



	platform_set_drvdata(pdev, ndev);

	platform_set_drvdata(pdev, cpsw);

	priv = netdev_priv(ndev);

	priv->cpsw = cpsw;

	priv->ndev = ndev;
@@ -2570,9 +2569,8 @@ static int cpsw_probe(struct platform_device *pdev) 


static int cpsw_remove(struct platform_device *pdev)

{

	struct net_device *ndev = platform_get_drvdata(pdev);

	struct cpsw_common *cpsw = ndev_to_cpsw(ndev);

	int ret;

	struct cpsw_common *cpsw = platform_get_drvdata(pdev);

	int i, ret;



	ret = pm_runtime_get_sync(&pdev->dev);

	if (ret < 0) {
@@ -2580,9 +2578,9 @@ static int cpsw_remove(struct platform_device *pdev) 
		return ret;

	}



	if (cpsw->data.dual_emac)

		unregister_netdev(cpsw->slaves[1].ndev);

	unregister_netdev(ndev);

	for (i = 0; i < cpsw->data.slaves; i++)

		if (cpsw->slaves[i].ndev)

			unregister_netdev(cpsw->slaves[i].ndev);



	cpts_release(cpsw->cpts);

	cpdma_ctlr_destroy(cpsw->dma);