Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next...

[linux-2.6-microblaze.git] / drivers / net / ethernet / ti / cpsw.c

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 634fc48..3430503 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1423,8 +1423,11 @@ static int cpsw_ndo_open(struct net_device *ndev)
        return 0;
 
 err_cleanup:
-       cpdma_ctlr_stop(cpsw->dma);
-       for_each_slave(priv, cpsw_slave_stop, cpsw);
+       if (!cpsw->usage_count) {
+               cpdma_ctlr_stop(cpsw->dma);
+               for_each_slave(priv, cpsw_slave_stop, cpsw);
+       }
+
        pm_runtime_put_sync(cpsw->dev);
        netif_carrier_off(priv->ndev);
        return ret;
@@ -2262,8 +2265,7 @@ no_phy_slave:
 
 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;
@@ -2474,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;
@@ -2567,9 +2569,8 @@ clean_runtime_disable_ret:
 
 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) {
@@ -2577,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);