net: pasemi: Remove usage of the deprecated "pci-dma-compat.h" API

In [1], Christoph Hellwig has proposed to remove the wrappers in
include/linux/pci-dma-compat.h.

Some reasons why this API should be removed have been given by Julia
Lawall in [2].

A coccinelle script has been used to perform the needed transformation
Only relevant parts are given below.

An 'unlikely()' has been removed when calling 'dma_mapping_error()' because
this function, which is inlined, already has such an annotation.

@@ @@
-    PCI_DMA_TODEVICE
+    DMA_TO_DEVICE

@@ @@
-    PCI_DMA_FROMDEVICE
+    DMA_FROM_DEVICE

@@
expression e1, e2, e3, e4;
@@
-    pci_map_single(e1, e2, e3, e4)
+    dma_map_single(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_single(e1, e2, e3, e4)
+    dma_unmap_single(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4, e5;
@@
-    pci_map_page(e1, e2, e3, e4, e5)
+    dma_map_page(&e1->dev, e2, e3, e4, e5)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_page(e1, e2, e3, e4)
+    dma_unmap_page(&e1->dev, e2, e3, e4)

@@
expression e1, e2;
@@
-    pci_dma_mapping_error(e1, e2)
+    dma_mapping_error(&e1->dev, e2)

[1]: https://lore.kernel.org/kernel-janitors/20200421081257.GA131897@infradead.org/
[2]: https://lore.kernel.org/kernel-janitors/alpine.DEB.2.22.394.2007120902170.2424@hadrien/

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/bc6cd281eae024b26fd9c7ef6678d2d1dc9d74fd.1630150008.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c
index 040a15a..7e096b2 100644 (file)
--- a/drivers/net/ethernet/pasemi/pasemi_mac.c
+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
@@ -247,12 +247,13 @@ static int pasemi_mac_unmap_tx_skb(struct pasemi_mac *mac,
        int f;
        struct pci_dev *pdev = mac->dma_pdev;
 
-       pci_unmap_single(pdev, dmas[0], skb_headlen(skb), PCI_DMA_TODEVICE);
+       dma_unmap_single(&pdev->dev, dmas[0], skb_headlen(skb), DMA_TO_DEVICE);
 
        for (f = 0; f < nfrags; f++) {
                const skb_frag_t *frag = &skb_shinfo(skb)->frags[f];
 
-               pci_unmap_page(pdev, dmas[f+1], skb_frag_size(frag), PCI_DMA_TODEVICE);
+               dma_unmap_page(&pdev->dev, dmas[f + 1], skb_frag_size(frag),
+                              DMA_TO_DEVICE);
        }
        dev_kfree_skb_irq(skb);
 
@@ -548,10 +549,8 @@ static void pasemi_mac_free_rx_buffers(struct pasemi_mac *mac)
        for (i = 0; i < RX_RING_SIZE; i++) {
                info = &RX_DESC_INFO(rx, i);
                if (info->skb && info->dma) {
-                       pci_unmap_single(mac->dma_pdev,
-                                        info->dma,
-                                        info->skb->len,
-                                        PCI_DMA_FROMDEVICE);
+                       dma_unmap_single(&mac->dma_pdev->dev, info->dma,
+                                        info->skb->len, DMA_FROM_DEVICE);
                        dev_kfree_skb_any(info->skb);
                }
                info->dma = 0;
@@ -600,11 +599,11 @@ static void pasemi_mac_replenish_rx_ring(struct net_device *dev,
                if (unlikely(!skb))
                        break;
 
-               dma = pci_map_single(mac->dma_pdev, skb->data,
+               dma = dma_map_single(&mac->dma_pdev->dev, skb->data,
                                     mac->bufsz - LOCAL_SKB_ALIGN,
-                                    PCI_DMA_FROMDEVICE);
+                                    DMA_FROM_DEVICE);
 
-               if (unlikely(pci_dma_mapping_error(mac->dma_pdev, dma))) {
+               if (dma_mapping_error(&mac->dma_pdev->dev, dma)) {
                        dev_kfree_skb_irq(info->skb);
                        break;
                }
@@ -741,8 +740,9 @@ static int pasemi_mac_clean_rx(struct pasemi_mac_rxring *rx,
 
                len = (macrx & XCT_MACRX_LLEN_M) >> XCT_MACRX_LLEN_S;
 
-               pci_unmap_single(pdev, dma, mac->bufsz - LOCAL_SKB_ALIGN,
-                                PCI_DMA_FROMDEVICE);
+               dma_unmap_single(&pdev->dev, dma,
+                                mac->bufsz - LOCAL_SKB_ALIGN,
+                                DMA_FROM_DEVICE);
 
                if (macrx & XCT_MACRX_CRC) {
                        /* CRC error flagged */
@@ -1444,10 +1444,10 @@ static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)
 
        nfrags = skb_shinfo(skb)->nr_frags;
 
-       map[0] = pci_map_single(mac->dma_pdev, skb->data, skb_headlen(skb),
-                               PCI_DMA_TODEVICE);
+       map[0] = dma_map_single(&mac->dma_pdev->dev, skb->data,
+                               skb_headlen(skb), DMA_TO_DEVICE);
        map_size[0] = skb_headlen(skb);
-       if (pci_dma_mapping_error(mac->dma_pdev, map[0]))
+       if (dma_mapping_error(&mac->dma_pdev->dev, map[0]))
                goto out_err_nolock;
 
        for (i = 0; i < nfrags; i++) {
@@ -1534,8 +1534,8 @@ out_err:
        spin_unlock_irqrestore(&txring->lock, flags);
 out_err_nolock:
        while (nfrags--)
-               pci_unmap_single(mac->dma_pdev, map[nfrags], map_size[nfrags],
-                                PCI_DMA_TODEVICE);
+               dma_unmap_single(&mac->dma_pdev->dev, map[nfrags],
+                                map_size[nfrags], DMA_TO_DEVICE);
 
        return NETDEV_TX_BUSY;
 }