Re: [PATCH 1/1] forcedeth: replace pci_map_single with dma_map_single functions

[David Miller]

From: Zhu Yanjun 
Date: Thu, 14 Sep 2017 23:01:51 -0400

> pci_map_single functions are obsolete. So replace them with
> dma_map_single functions.
> 
> Signed-off-by: Zhu Yanjun 

Applied, thanks.

[PATCH 1/1] forcedeth: replace pci_map_single with dma_map_single functions

[Zhu Yanjun]

pci_map_single functions are obsolete. So replace them with
dma_map_single functions.

Signed-off-by: Zhu Yanjun 
---
 drivers/net/ethernet/nvidia/forcedeth.c | 70 +
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/drivers/net/ethernet/nvidia/forcedeth.c 
b/drivers/net/ethernet/nvidia/forcedeth.c
index e6e0de4..0a7ba3a 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -1812,12 +1812,12 @@ static int nv_alloc_rx(struct net_device *dev)
struct sk_buff *skb = netdev_alloc_skb(dev, np->rx_buf_sz + 
NV_RX_ALLOC_PAD);
if (skb) {
np->put_rx_ctx->skb = skb;
-   np->put_rx_ctx->dma = pci_map_single(np->pci_dev,
+   np->put_rx_ctx->dma = dma_map_single(>pci_dev->dev,
 skb->data,
 skb_tailroom(skb),
-
PCI_DMA_FROMDEVICE);
-   if (pci_dma_mapping_error(np->pci_dev,
- np->put_rx_ctx->dma)) {
+DMA_FROM_DEVICE);
+   if (dma_mapping_error(>pci_dev->dev,
+ np->put_rx_ctx->dma)) {
kfree_skb(skb);
goto packet_dropped;
}
@@ -1853,12 +1853,12 @@ static int nv_alloc_rx_optimized(struct net_device *dev)
struct sk_buff *skb = netdev_alloc_skb(dev, np->rx_buf_sz + 
NV_RX_ALLOC_PAD);
if (skb) {
np->put_rx_ctx->skb = skb;
-   np->put_rx_ctx->dma = pci_map_single(np->pci_dev,
+   np->put_rx_ctx->dma = dma_map_single(>pci_dev->dev,
 skb->data,
 skb_tailroom(skb),
-
PCI_DMA_FROMDEVICE);
-   if (pci_dma_mapping_error(np->pci_dev,
- np->put_rx_ctx->dma)) {
+DMA_FROM_DEVICE);
+   if (dma_mapping_error(>pci_dev->dev,
+ np->put_rx_ctx->dma)) {
kfree_skb(skb);
goto packet_dropped;
}
@@ -1975,9 +1975,9 @@ static void nv_unmap_txskb(struct fe_priv *np, struct 
nv_skb_map *tx_skb)
 {
if (tx_skb->dma) {
if (tx_skb->dma_single)
-   pci_unmap_single(np->pci_dev, tx_skb->dma,
+   dma_unmap_single(>pci_dev->dev, tx_skb->dma,
 tx_skb->dma_len,
-PCI_DMA_TODEVICE);
+DMA_TO_DEVICE);
else
pci_unmap_page(np->pci_dev, tx_skb->dma,
   tx_skb->dma_len,
@@ -2045,10 +2045,10 @@ static void nv_drain_rx(struct net_device *dev)
}
wmb();
if (np->rx_skb[i].skb) {
-   pci_unmap_single(np->pci_dev, np->rx_skb[i].dma,
+   dma_unmap_single(>pci_dev->dev, np->rx_skb[i].dma,
 (skb_end_pointer(np->rx_skb[i].skb) -
- np->rx_skb[i].skb->data),
-PCI_DMA_FROMDEVICE);
+np->rx_skb[i].skb->data),
+DMA_FROM_DEVICE);
dev_kfree_skb(np->rx_skb[i].skb);
np->rx_skb[i].skb = NULL;
}
@@ -2221,10 +2221,11 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, 
struct net_device *dev)
prev_tx = put_tx;
prev_tx_ctx = np->put_tx_ctx;
bcnt = (size > NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : 
size;
-   np->put_tx_ctx->dma = pci_map_single(np->pci_dev, skb->data + 
offset, bcnt,
-   PCI_DMA_TODEVICE);
-   if (pci_dma_mapping_error(np->pci_dev,
- np->put_tx_ctx->dma)) {
+   np->put_tx_ctx->dma = dma_map_single(>pci_dev->dev,
+skb->data + offset, bcnt,
+DMA_TO_DEVICE);
+   if (dma_mapping_error(>pci_dev->dev,
+ np->put_tx_ctx->dma)) {
/* on