Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 340663
b: refs/heads/master
c: 9169963
h: refs/heads/master
i:
  340661: 043412f
  340659: ad5941e
  340655: 0e441ab
v: v3
  • Loading branch information
Rob Herring authored and David S. Miller committed Nov 7, 2012
1 parent bfb8261 commit 03b4288
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0ec6d343f7bcf9e0944aa9ff65287b987ec00c0f
refs/heads/master: 9169963d8090288995b19bc8065d305843bad617
6 changes: 0 additions & 6 deletions trunk/drivers/net/ethernet/calxeda/xgmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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))
Expand Down

0 comments on commit 03b4288

Please sign in to comment.