lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r8169: replace PCI_DMA_{TO,FROM}DEVICE to DMA_{TO,FROM}_DEVICE

Browse Source 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stanislaw Gruszka
2010-10-20 22:25:38 +00:00
committed by David S. Miller
parent 0ecbe1cadd
commit 231aee63c1
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/r8169.c
View File

@@ -3948,7 +3948,7 @@ static void rtl8169_free_rx_databuff(struct rtl8169_private *tp,
struct pci_dev *pdev = tp->pci_dev; struct pci_dev *pdev = tp->pci_dev;
dma_unmap_single(&pdev->dev, le64_to_cpu(desc->addr), rx_buf_sz, dma_unmap_single(&pdev->dev, le64_to_cpu(desc->addr), rx_buf_sz,
PCI_DMA_FROMDEVICE); DMA_FROM_DEVICE);
kfree(*data_buff); kfree(*data_buff);
*data_buff = NULL; *data_buff = NULL;
rtl8169_make_unusable_by_asic(desc); rtl8169_make_unusable_by_asic(desc);
@@ -3994,7 +3994,7 @@ static struct sk_buff *rtl8169_alloc_rx_data(struct rtl8169_private *tp,
} }
mapping = dma_map_single(&tp->pci_dev->dev, rtl8169_align(data), rx_buf_sz, mapping = dma_map_single(&tp->pci_dev->dev, rtl8169_align(data), rx_buf_sz,
PCI_DMA_FROMDEVICE); DMA_FROM_DEVICE);
if (unlikely(dma_mapping_error(&tp->pci_dev->dev, mapping))) if (unlikely(dma_mapping_error(&tp->pci_dev->dev, mapping)))
goto err_out; goto err_out;
@@ -4072,7 +4072,7 @@ static void rtl8169_unmap_tx_skb(struct pci_dev *pdev, struct ring_info *tx_skb,
unsigned int len = tx_skb->len; unsigned int len = tx_skb->len;
dma_unmap_single(&pdev->dev, le64_to_cpu(desc->addr), len, dma_unmap_single(&pdev->dev, le64_to_cpu(desc->addr), len,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
desc->opts1 = 0x00; desc->opts1 = 0x00;
desc->opts2 = 0x00; desc->opts2 = 0x00;
desc->addr = 0x00; desc->addr = 0x00;
@@ -4223,7 +4223,7 @@ static int rtl8169_xmit_frags(struct rtl8169_private *tp, struct sk_buff *skb,
len = frag->size; len = frag->size;
addr = ((void *) page_address(frag->page)) + frag->page_offset; addr = ((void *) page_address(frag->page)) + frag->page_offset;
mapping = dma_map_single(&tp->pci_dev->dev, addr, len, mapping = dma_map_single(&tp->pci_dev->dev, addr, len,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
if (unlikely(dma_mapping_error(&tp->pci_dev->dev, mapping))) if (unlikely(dma_mapping_error(&tp->pci_dev->dev, mapping)))
goto err_out; goto err_out;
@@ -4290,7 +4290,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
len = skb_headlen(skb); len = skb_headlen(skb);
mapping = dma_map_single(&tp->pci_dev->dev, skb->data, len, mapping = dma_map_single(&tp->pci_dev->dev, skb->data, len,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
if (unlikely(dma_mapping_error(&tp->pci_dev->dev, mapping))) if (unlikely(dma_mapping_error(&tp->pci_dev->dev, mapping)))
goto err_dma_0; goto err_dma_0;
@@ -4469,13 +4469,13 @@ static struct sk_buff *rtl8169_try_rx_copy(void *data,
data = rtl8169_align(data); data = rtl8169_align(data);
dma_sync_single_for_cpu(&tp->pci_dev->dev, addr, pkt_size, dma_sync_single_for_cpu(&tp->pci_dev->dev, addr, pkt_size,
PCI_DMA_FROMDEVICE); DMA_FROM_DEVICE);
prefetch(data); prefetch(data);
skb = netdev_alloc_skb_ip_align(tp->dev, pkt_size); skb = netdev_alloc_skb_ip_align(tp->dev, pkt_size);
if (skb) if (skb)
memcpy(skb->data, data, pkt_size); memcpy(skb->data, data, pkt_size);
dma_sync_single_for_device(&tp->pci_dev->dev, addr, pkt_size, dma_sync_single_for_device(&tp->pci_dev->dev, addr, pkt_size,
PCI_DMA_FROMDEVICE); DMA_FROM_DEVICE);
return skb; return skb;
} }