net: cpsw: remove redundant calls enabling dma interrupts.
authorRichard Cochran <richardcochran@gmail.com>
Mon, 25 May 2015 09:02:15 +0000 (11:02 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 May 2015 22:19:09 +0000 (18:19 -0400)
The function, cpsw_intr_enable, already calls cpdma_ctlr_int_ctrl.  There
is no need to enable the dma interrupts twice.  This patch removes the
extra call.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ti/cpsw.c

index e9e3ab36bd7c4f097306ce063781ac51f18ca27b..0d0cf9a9f908246d37c96db692d722807917e367 100644 (file)
@@ -1592,7 +1592,6 @@ static void cpsw_ndo_tx_timeout(struct net_device *ndev)
        cpdma_ctlr_int_ctrl(priv->dma, false);
        cpdma_chan_stop(priv->txch);
        cpdma_chan_start(priv->txch);
-       cpdma_ctlr_int_ctrl(priv->dma, true);
        cpsw_intr_enable(priv);
 }
 
@@ -1632,7 +1631,6 @@ static void cpsw_ndo_poll_controller(struct net_device *ndev)
        cpdma_ctlr_int_ctrl(priv->dma, false);
        cpsw_rx_interrupt(priv->irqs_table[0], priv);
        cpsw_tx_interrupt(priv->irqs_table[1], priv);
-       cpdma_ctlr_int_ctrl(priv->dma, true);
        cpsw_intr_enable(priv);
 }
 #endif