diff options
Diffstat (limited to 'drivers/net/ethernet/sfc/rx.c')
-rw-r--r-- | drivers/net/ethernet/sfc/rx.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c index fca61fea38e0..719319b89d7a 100644 --- a/drivers/net/ethernet/sfc/rx.c +++ b/drivers/net/ethernet/sfc/rx.c | |||
@@ -155,11 +155,11 @@ static int efx_init_rx_buffers_skb(struct efx_rx_queue *rx_queue) | |||
155 | rx_buf->len = skb_len - NET_IP_ALIGN; | 155 | rx_buf->len = skb_len - NET_IP_ALIGN; |
156 | rx_buf->flags = 0; | 156 | rx_buf->flags = 0; |
157 | 157 | ||
158 | rx_buf->dma_addr = pci_map_single(efx->pci_dev, | 158 | rx_buf->dma_addr = dma_map_single(&efx->pci_dev->dev, |
159 | skb->data, rx_buf->len, | 159 | skb->data, rx_buf->len, |
160 | PCI_DMA_FROMDEVICE); | 160 | DMA_FROM_DEVICE); |
161 | if (unlikely(pci_dma_mapping_error(efx->pci_dev, | 161 | if (unlikely(dma_mapping_error(&efx->pci_dev->dev, |
162 | rx_buf->dma_addr))) { | 162 | rx_buf->dma_addr))) { |
163 | dev_kfree_skb_any(skb); | 163 | dev_kfree_skb_any(skb); |
164 | rx_buf->u.skb = NULL; | 164 | rx_buf->u.skb = NULL; |
165 | return -EIO; | 165 | return -EIO; |
@@ -200,10 +200,10 @@ static int efx_init_rx_buffers_page(struct efx_rx_queue *rx_queue) | |||
200 | efx->rx_buffer_order); | 200 | efx->rx_buffer_order); |
201 | if (unlikely(page == NULL)) | 201 | if (unlikely(page == NULL)) |
202 | return -ENOMEM; | 202 | return -ENOMEM; |
203 | dma_addr = pci_map_page(efx->pci_dev, page, 0, | 203 | dma_addr = dma_map_page(&efx->pci_dev->dev, page, 0, |
204 | efx_rx_buf_size(efx), | 204 | efx_rx_buf_size(efx), |
205 | PCI_DMA_FROMDEVICE); | 205 | DMA_FROM_DEVICE); |
206 | if (unlikely(pci_dma_mapping_error(efx->pci_dev, dma_addr))) { | 206 | if (unlikely(dma_mapping_error(&efx->pci_dev->dev, dma_addr))) { |
207 | __free_pages(page, efx->rx_buffer_order); | 207 | __free_pages(page, efx->rx_buffer_order); |
208 | return -EIO; | 208 | return -EIO; |
209 | } | 209 | } |
@@ -247,14 +247,14 @@ static void efx_unmap_rx_buffer(struct efx_nic *efx, | |||
247 | 247 | ||
248 | state = page_address(rx_buf->u.page); | 248 | state = page_address(rx_buf->u.page); |
249 | if (--state->refcnt == 0) { | 249 | if (--state->refcnt == 0) { |
250 | pci_unmap_page(efx->pci_dev, | 250 | dma_unmap_page(&efx->pci_dev->dev, |
251 | state->dma_addr, | 251 | state->dma_addr, |
252 | efx_rx_buf_size(efx), | 252 | efx_rx_buf_size(efx), |
253 | PCI_DMA_FROMDEVICE); | 253 | DMA_FROM_DEVICE); |
254 | } | 254 | } |
255 | } else if (!(rx_buf->flags & EFX_RX_BUF_PAGE) && rx_buf->u.skb) { | 255 | } else if (!(rx_buf->flags & EFX_RX_BUF_PAGE) && rx_buf->u.skb) { |
256 | pci_unmap_single(efx->pci_dev, rx_buf->dma_addr, | 256 | dma_unmap_single(&efx->pci_dev->dev, rx_buf->dma_addr, |
257 | rx_buf->len, PCI_DMA_FROMDEVICE); | 257 | rx_buf->len, DMA_FROM_DEVICE); |
258 | } | 258 | } |
259 | } | 259 | } |
260 | 260 | ||