aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/arm
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2009-05-27 11:10:42 -0400
committerDavid S. Miller <davem@davemloft.net>2009-05-29 04:51:22 -0400
commit5d23a1d2a317e272f171d7818f600fde324eaceb (patch)
treebc0d938e894464a923eecc719f332eee0cbe2aa3 /drivers/net/arm
parent108bfa895cacd1a7c1767e85be105b213e5dce50 (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')
-rw-r--r--drivers/net/arm/ep93xx_eth.c4
-rw-r--r--drivers/net/arm/ixp4xx_eth.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c
index b72b3d639f6e..fbf4645417d4 100644
--- a/drivers/net/arm/ep93xx_eth.c
+++ b/drivers/net/arm/ep93xx_eth.c
@@ -253,7 +253,7 @@ static int ep93xx_rx(struct net_device *dev, int processed, int budget)
253 skb = dev_alloc_skb(length + 2); 253 skb = dev_alloc_skb(length + 2);
254 if (likely(skb != NULL)) { 254 if (likely(skb != NULL)) {
255 skb_reserve(skb, 2); 255 skb_reserve(skb, 2);
256 dma_sync_single(NULL, ep->descs->rdesc[entry].buf_addr, 256 dma_sync_single_for_cpu(NULL, ep->descs->rdesc[entry].buf_addr,
257 length, DMA_FROM_DEVICE); 257 length, DMA_FROM_DEVICE);
258 skb_copy_to_linear_data(skb, ep->rx_buf[entry], length); 258 skb_copy_to_linear_data(skb, ep->rx_buf[entry], length);
259 skb_put(skb, length); 259 skb_put(skb, length);
@@ -331,7 +331,7 @@ static int ep93xx_xmit(struct sk_buff *skb, struct net_device *dev)
331 ep->descs->tdesc[entry].tdesc1 = 331 ep->descs->tdesc[entry].tdesc1 =
332 TDESC1_EOF | (entry << 16) | (skb->len & 0xfff); 332 TDESC1_EOF | (entry << 16) | (skb->len & 0xfff);
333 skb_copy_and_csum_dev(skb, ep->tx_buf[entry]); 333 skb_copy_and_csum_dev(skb, ep->tx_buf[entry]);
334 dma_sync_single(NULL, ep->descs->tdesc[entry].buf_addr, 334 dma_sync_single_for_cpu(NULL, ep->descs->tdesc[entry].buf_addr,
335 skb->len, DMA_TO_DEVICE); 335 skb->len, DMA_TO_DEVICE);
336 dev_kfree_skb(skb); 336 dev_kfree_skb(skb);
337 337
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