net: cpsw: remove redundant calls disabling dma interrupts.

The function, cpsw_intr_disable, already calls cpdma_ctlr_int_ctrl.  There
is no need to disable the dma interrupts twice.  This patch removes the
extra calls.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 0d0cf9a9f908246d37c96db692d722807917e367..462820514faea05beaa77f5a7e94ede318c294c6 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1361,7 +1361,6 @@ static int cpsw_ndo_stop(struct net_device *ndev)
        if (cpsw_common_res_usage_state(priv) <= 1) {
                cpts_unregister(priv->cpts);
                cpsw_intr_disable(priv);
-               cpdma_ctlr_int_ctrl(priv->dma, false);
                cpdma_ctlr_stop(priv->dma);
                cpsw_ale_stop(priv->ale);
        }
@@ -1589,7 +1588,6 @@ static void cpsw_ndo_tx_timeout(struct net_device *ndev)
        cpsw_err(priv, tx_err, "transmit timeout, restarting dma\n");
        ndev->stats.tx_errors++;
        cpsw_intr_disable(priv);
-       cpdma_ctlr_int_ctrl(priv->dma, false);
        cpdma_chan_stop(priv->txch);
        cpdma_chan_start(priv->txch);
        cpsw_intr_enable(priv);
@@ -1628,7 +1626,6 @@ static void cpsw_ndo_poll_controller(struct net_device *ndev)
        struct cpsw_priv *priv = netdev_priv(ndev);
 
        cpsw_intr_disable(priv);
-       cpdma_ctlr_int_ctrl(priv->dma, false);
        cpsw_rx_interrupt(priv->irqs_table[0], priv);
        cpsw_tx_interrupt(priv->irqs_table[1], priv);
        cpsw_intr_enable(priv);