From 03b42885d3cd170731700ebb8b080e17ad3176f5 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Mon, 5 Nov 2012 06:22:22 +0000 Subject: [PATCH] --- yaml --- r: 340663 b: refs/heads/master c: 9169963d8090288995b19bc8065d305843bad617 h: refs/heads/master i: 340661: 043412f26e28131fc3d418019361fd5d1bba62b3 340659: ad5941e59e0f2cf3d7efb26297aebc1e4bd10f4f 340655: 0e441ab16464e93d572e65d827906ee116a1cd7f v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/calxeda/xgmac.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 27014cc95af5..be4a90ad8116 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ec6d343f7bcf9e0944aa9ff65287b987ec00c0f +refs/heads/master: 9169963d8090288995b19bc8065d305843bad617 diff --git a/trunk/drivers/net/ethernet/calxeda/xgmac.c b/trunk/drivers/net/ethernet/calxeda/xgmac.c index 84cd40e4f081..826321910efc 100644 --- a/trunk/drivers/net/ethernet/calxeda/xgmac.c +++ b/trunk/drivers/net/ethernet/calxeda/xgmac.c @@ -846,9 +846,6 @@ static void xgmac_free_dma_desc_rings(struct xgmac_priv *priv) static void xgmac_tx_complete(struct xgmac_priv *priv) { int i; - void __iomem *ioaddr = priv->base; - - writel(DMA_STATUS_TU | DMA_STATUS_NIS, ioaddr + XGMAC_DMA_STATUS); while (dma_ring_cnt(priv->tx_head, priv->tx_tail, DMA_TX_RING_SZ)) { unsigned int entry = priv->tx_tail; @@ -1139,9 +1136,6 @@ static int xgmac_rx(struct xgmac_priv *priv, int limit) struct sk_buff *skb; int frame_len; - writel(DMA_STATUS_RI | DMA_STATUS_NIS, - priv->base + XGMAC_DMA_STATUS); - entry = priv->rx_tail; p = priv->dma_rx + entry; if (desc_get_owner(p))