diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2015-05-25 11:02:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-25 18:19:09 -0400 |
| commit | 61d22596a760091b51d93853b3a303c2241193be (patch) | |
| tree | 44ede75dd102b2236e2e6a0c4891a9d1eb270af4 /drivers/net/ethernet/ti/cpsw.c | |
| parent | 071f1a960c67be004c4fa34e0b079c7747038693 (diff) | |
| download | blackbird-op-linux-61d22596a760091b51d93853b3a303c2241193be.tar.gz blackbird-op-linux-61d22596a760091b51d93853b3a303c2241193be.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/ti/cpsw.c')
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 0d0cf9a9f908..462820514fae 100644 --- 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); |
