[PATCH net-next 1/1] forcedeth: replace pci_unmap_page with dma_unmap_page

Subsystems: forcedeth gigabit ethernet driver, networking drivers, the rest

STALE3187d

4 messages, 2 authors, 2017-11-24 · open the first message on its own page

[PATCH net-next 1/1] forcedeth: replace pci_unmap_page with dma_unmap_page

From: Zhu Yanjun <hidden>
Date: 2017-11-19 14:02:36

The function pci_unmap_page is obsolete. So it is replaced with
the function dma_unmap_page.

CC: Srinivas Eeda <redacted>
CC: Joe Jin <redacted>
CC: Junxiao Bi <redacted>
Signed-off-by: Zhu Yanjun <redacted>
---
 drivers/net/ethernet/nvidia/forcedeth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index ac8439c..0febe41 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -1986,7 +1986,7 @@ static void nv_unmap_txskb(struct fe_priv *np, struct nv_skb_map *tx_skb)
 					 tx_skb->dma_len,
 					 DMA_TO_DEVICE);
 		else
-			pci_unmap_page(np->pci_dev, tx_skb->dma,
+			dma_unmap_page(&np->pci_dev->dev, tx_skb->dma,
 				       tx_skb->dma_len,
 				       PCI_DMA_TODEVICE);
 		tx_skb->dma = 0;
-- 
2.7.4

Re: [PATCH net-next 1/1] forcedeth: replace pci_unmap_page with dma_unmap_page

From: David Miller <davem@davemloft.net>
Date: 2017-11-20 02:38:25

From: Zhu Yanjun <redacted>
Date: Sun, 19 Nov 2017 09:05:31 -0500
quoted hunk
@@ -1986,7 +1986,7 @@ static void nv_unmap_txskb(struct fe_priv *np, struct nv_skb_map *tx_skb)
 					 tx_skb->dma_len,
 					 DMA_TO_DEVICE);
 		else
-			pci_unmap_page(np->pci_dev, tx_skb->dma,
+			dma_unmap_page(&np->pci_dev->dev, tx_skb->dma,
 				       tx_skb->dma_len,
 				       PCI_DMA_TODEVICE);
So you're going to call a dma_*() function using a PCI_DMA_* direction
flag?

Please correct this.

Thank you.

[PATCHv2 net-next 1/1] forcedeth: replace pci_unmap_page with dma_unmap_page

From: Zhu Yanjun <hidden>
Date: 2017-11-20 03:18:14

The function pci_unmap_page is obsolete. So it is replaced with
the function dma_unmap_page.

CC: Srinivas Eeda <redacted>
CC: Joe Jin <redacted>
CC: Junxiao Bi <redacted>
Signed-off-by: Zhu Yanjun <redacted>
---
V1->V2: fix direction flag error.
---
 drivers/net/ethernet/nvidia/forcedeth.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index ac8439c..481876b 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -1986,9 +1986,9 @@ static void nv_unmap_txskb(struct fe_priv *np, struct nv_skb_map *tx_skb)
 					 tx_skb->dma_len,
 					 DMA_TO_DEVICE);
 		else
-			pci_unmap_page(np->pci_dev, tx_skb->dma,
+			dma_unmap_page(&np->pci_dev->dev, tx_skb->dma,
 				       tx_skb->dma_len,
-				       PCI_DMA_TODEVICE);
+				       DMA_TO_DEVICE);
 		tx_skb->dma = 0;
 	}
 }
-- 
2.7.4

Re: [PATCHv2 net-next 1/1] forcedeth: replace pci_unmap_page with dma_unmap_page

From: David Miller <davem@davemloft.net>
Date: 2017-11-24 20:09:22

From: Zhu Yanjun <redacted>
Date: Sun, 19 Nov 2017 22:21:08 -0500
The function pci_unmap_page is obsolete. So it is replaced with
the function dma_unmap_page.

CC: Srinivas Eeda <redacted>
CC: Joe Jin <redacted>
CC: Junxiao Bi <redacted>
Signed-off-by: Zhu Yanjun <redacted>
---
V1->V2: fix direction flag error.
Applied, thank you.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help