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>

4 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index dc9e21af2dd1..e2ba78be1c2a 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -1906,8 +1906,8 @@ netxen_map_tx_skb(struct pci_dev *pdev,
                 nf = &pbuf->frag_array[i+1];
 
                 map = skb_frag_dma_map(&pdev->dev, frag, 0, frag->size,
-                                       PCI_DMA_TODEVICE);
-                if (pci_dma_mapping_error(pdev, map))
+                                       DMA_TO_DEVICE);
+                if (dma_mapping_error(&pdev->dev, map))
                         goto unwind;
 
                 nf->dma = map;
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
index 1871d88ee712..46f9b6499f9b 100644
--- a/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -2389,9 +2389,9 @@ static int ql_send_map(struct ql3_adapter *qdev,
                 }
 
                 map = skb_frag_dma_map(&qdev->pdev->dev, frag, 0, frag->size,
-                                       PCI_DMA_TODEVICE);
+                                       DMA_TO_DEVICE);
 
-                err = pci_dma_mapping_error(qdev->pdev, map);
+                err = dma_mapping_error(&qdev->pdev->dev, map);
                 if (err) {
                         netdev_err(qdev->ndev,
                                    "PCI mapping frags failed with error: %d\n",
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 445956e2d045..eac19e7d2761 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -2136,8 +2136,8 @@ qlcnic_map_tx_skb(struct pci_dev *pdev,
                 nf = &pbuf->frag_array[i+1];
 
                 map = skb_frag_dma_map(&pdev->dev, frag, 0, frag->size,
-                                       PCI_DMA_TODEVICE);
-                if (pci_dma_mapping_error(pdev, map))
+                                       DMA_TO_DEVICE);
+                if (dma_mapping_error(&pdev->dev, map))
                         goto unwind;
 
                 nf->dma = map;
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index ce6c6fee3089..f2d9bb78ec7f 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -1432,9 +1432,9 @@ static int ql_map_send(struct ql_adapter *qdev,
                 }
 
                 map = skb_frag_dma_map(&qdev->pdev->dev, frag, 0, frag->size,
-                                       PCI_DMA_TODEVICE);
+                                       DMA_TO_DEVICE);
 
-                err = pci_dma_mapping_error(qdev->pdev, map);
+                err = dma_mapping_error(&qdev->pdev->dev, map);
                 if (err) {
                         netif_err(qdev, tx_queued, qdev->ndev,
                                   "PCI mapping frags failed with error: %d.\n",