diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2009-05-27 11:10:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-29 04:51:22 -0400 |
commit | 5d23a1d2a317e272f171d7818f600fde324eaceb (patch) | |
tree | bc0d938e894464a923eecc719f332eee0cbe2aa3 /drivers/net/arm/ixp4xx_eth.c | |
parent | 108bfa895cacd1a7c1767e85be105b213e5dce50 (diff) |
net: replace dma_sync_single with dma_sync_single_for_cpu
This replaces dma_sync_single() with dma_sync_single_for_cpu() because
dma_sync_single() is an obsolete API; include/linux/dma-mapping.h says:
/* Backwards compat, remove in 2.7.x */
#define dma_sync_single dma_sync_single_for_cpu
#define dma_sync_sg dma_sync_sg_for_cpu
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/arm/ixp4xx_eth.c')
-rw-r--r-- | drivers/net/arm/ixp4xx_eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c index 322c49b908dc..1fcf8388b1c8 100644 --- a/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c | |||
@@ -561,8 +561,8 @@ static int eth_poll(struct napi_struct *napi, int budget) | |||
561 | dma_unmap_single(&dev->dev, desc->data - NET_IP_ALIGN, | 561 | dma_unmap_single(&dev->dev, desc->data - NET_IP_ALIGN, |
562 | RX_BUFF_SIZE, DMA_FROM_DEVICE); | 562 | RX_BUFF_SIZE, DMA_FROM_DEVICE); |
563 | #else | 563 | #else |
564 | dma_sync_single(&dev->dev, desc->data - NET_IP_ALIGN, | 564 | dma_sync_single_for_cpu(&dev->dev, desc->data - NET_IP_ALIGN, |
565 | RX_BUFF_SIZE, DMA_FROM_DEVICE); | 565 | RX_BUFF_SIZE, DMA_FROM_DEVICE); |
566 | memcpy_swab32((u32 *)skb->data, (u32 *)port->rx_buff_tab[n], | 566 | memcpy_swab32((u32 *)skb->data, (u32 *)port->rx_buff_tab[n], |
567 | ALIGN(NET_IP_ALIGN + desc->pkt_len, 4) / 4); | 567 | ALIGN(NET_IP_ALIGN + desc->pkt_len, 4) / 4); |
568 | #endif | 568 | #endif |