Commit 61d22596 authored by Richard Cochran's avatar Richard Cochran Committed by David S. Miller

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: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 071f1a96
...@@ -1361,7 +1361,6 @@ static int cpsw_ndo_stop(struct net_device *ndev) ...@@ -1361,7 +1361,6 @@ static int cpsw_ndo_stop(struct net_device *ndev)
if (cpsw_common_res_usage_state(priv) <= 1) { if (cpsw_common_res_usage_state(priv) <= 1) {
cpts_unregister(priv->cpts); cpts_unregister(priv->cpts);
cpsw_intr_disable(priv); cpsw_intr_disable(priv);
cpdma_ctlr_int_ctrl(priv->dma, false);
cpdma_ctlr_stop(priv->dma); cpdma_ctlr_stop(priv->dma);
cpsw_ale_stop(priv->ale); cpsw_ale_stop(priv->ale);
} }
...@@ -1589,7 +1588,6 @@ static void cpsw_ndo_tx_timeout(struct net_device *ndev) ...@@ -1589,7 +1588,6 @@ static void cpsw_ndo_tx_timeout(struct net_device *ndev)
cpsw_err(priv, tx_err, "transmit timeout, restarting dma\n"); cpsw_err(priv, tx_err, "transmit timeout, restarting dma\n");
ndev->stats.tx_errors++; ndev->stats.tx_errors++;
cpsw_intr_disable(priv); cpsw_intr_disable(priv);
cpdma_ctlr_int_ctrl(priv->dma, false);
cpdma_chan_stop(priv->txch); cpdma_chan_stop(priv->txch);
cpdma_chan_start(priv->txch); cpdma_chan_start(priv->txch);
cpsw_intr_enable(priv); cpsw_intr_enable(priv);
...@@ -1628,7 +1626,6 @@ static void cpsw_ndo_poll_controller(struct net_device *ndev) ...@@ -1628,7 +1626,6 @@ static void cpsw_ndo_poll_controller(struct net_device *ndev)
struct cpsw_priv *priv = netdev_priv(ndev); struct cpsw_priv *priv = netdev_priv(ndev);
cpsw_intr_disable(priv); cpsw_intr_disable(priv);
cpdma_ctlr_int_ctrl(priv->dma, false);
cpsw_rx_interrupt(priv->irqs_table[0], priv); cpsw_rx_interrupt(priv->irqs_table[0], priv);
cpsw_tx_interrupt(priv->irqs_table[1], priv); cpsw_tx_interrupt(priv->irqs_table[1], priv);
cpsw_intr_enable(priv); cpsw_intr_enable(priv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment