net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map

When I converted some drivers from pci_map_page to skb_frag_dma_map I
neglected to convert PCI_DMA_xDEVICE into DMA_x_DEVICE and
pci_dma_mapping_error into dma_mapping_error.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index a0a647154245..32db4c877ff1 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -2777,7 +2777,7 @@ static netdev_tx_t skge_xmit_frame(struct sk_buff *skb,
                         skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
                         map = skb_frag_dma_map(&hw->pdev->dev, frag, 0,
-                                               frag->size, PCI_DMA_TODEVICE);
+                                               frag->size, DMA_TO_DEVICE);
 
                         e = e->next;
                         e->skb = skb;
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 338b10c6f52e..a3ce9b6d36af 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -1229,9 +1229,9 @@ static int sky2_rx_map_skb(struct pci_dev *pdev, struct rx_ring_info *re,
 
                 re->frag_addr[i] = skb_frag_dma_map(&pdev->dev, frag, 0,
                                                     frag->size,
-                                                    PCI_DMA_FROMDEVICE);
+                                                    DMA_FROM_DEVICE);
 
-                if (pci_dma_mapping_error(pdev, re->frag_addr[i]))
+                if (dma_mapping_error(&pdev->dev, re->frag_addr[i]))
                         goto map_page_error;
         }
         return 0;
@@ -1936,9 +1936,9 @@ static netdev_tx_t sky2_xmit_frame(struct sk_buff *skb,
                 const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
                 mapping = skb_frag_dma_map(&hw->pdev->dev, frag, 0,
-                                           frag->size, PCI_DMA_TODEVICE);
+                                           frag->size, DMA_TO_DEVICE);
 
-                if (pci_dma_mapping_error(hw->pdev, mapping))
+                if (dma_mapping_error(&hw->pdev->dev, mapping))
                         goto mapping_unwind;
 
                 upper = upper_32_bits(mapping);