sc92031: switch from 'pci_' to 'dma_' API

The wrappers in include/linux/pci-dma-compat.h should go away.

The patch has been generated with the coccinelle script below and has been
hand modified to replace GFP_ with a correct flag.
It has been compile tested.

When memory is allocated in 'sc92031_open()' GFP_KERNEL can be used
because it is a '.ndo_open' function and no lock is taken in the between.
'.ndo_open' functions are synchronized with the rtnl_lock() semaphore.

@@
@@
-    PCI_DMA_BIDIRECTIONAL
+    DMA_BIDIRECTIONAL

@@
@@
-    PCI_DMA_TODEVICE
+    DMA_TO_DEVICE

@@
@@
-    PCI_DMA_FROMDEVICE
+    DMA_FROM_DEVICE

@@
@@
-    PCI_DMA_NONE
+    DMA_NONE

@@
expression e1, e2, e3;
@@
-    pci_alloc_consistent(e1, e2, e3)
+    dma_alloc_coherent(&e1->dev, e2, e3, GFP_)

@@
expression e1, e2, e3;
@@
-    pci_zalloc_consistent(e1, e2, e3)
+    dma_alloc_coherent(&e1->dev, e2, e3, GFP_)

@@
expression e1, e2, e3, e4;
@@
-    pci_free_consistent(e1, e2, e3, e4)
+    dma_free_coherent(&e1->dev, e2, e3, e4)

@@
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, e3, e4;
@@
-    pci_map_sg(e1, e2, e3, e4)
+    dma_map_sg(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_sg(e1, e2, e3, e4)
+    dma_unmap_sg(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_single_for_cpu(e1, e2, e3, e4)
+    dma_sync_single_for_cpu(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_single_for_device(e1, e2, e3, e4)
+    dma_sync_single_for_device(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_sg_for_cpu(e1, e2, e3, e4)
+    dma_sync_sg_for_cpu(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_sg_for_device(e1, e2, e3, e4)
+    dma_sync_sg_for_device(&e1->dev, e2, e3, e4)

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

@@
expression e1, e2;
@@
-    pci_set_dma_mask(e1, e2)
+    dma_set_mask(&e1->dev, e2)

@@
expression e1, e2;
@@
-    pci_set_consistent_dma_mask(e1, e2)
+    dma_set_coherent_mask(&e1->dev, e2)

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/silan/sc92031.c b/drivers/net/ethernet/silan/sc92031.c
index f94078f8ebe5ed15ed2788c3a9a6870019da0724..91b60c51079bfaa61df65db284305fdec6127ea5 100644 (file)
--- a/drivers/net/ethernet/silan/sc92031.c
+++ b/drivers/net/ethernet/silan/sc92031.c
@@ -993,15 +993,15 @@ static int sc92031_open(struct net_device *dev)
        struct sc92031_priv *priv = netdev_priv(dev);
        struct pci_dev *pdev = priv->pdev;
 
-       priv->rx_ring = pci_alloc_consistent(pdev, RX_BUF_LEN,
-                       &priv->rx_ring_dma_addr);
+       priv->rx_ring = dma_alloc_coherent(&pdev->dev, RX_BUF_LEN,
+                                          &priv->rx_ring_dma_addr, GFP_KERNEL);
        if (unlikely(!priv->rx_ring)) {
                err = -ENOMEM;
                goto out_alloc_rx_ring;
        }
 
-       priv->tx_bufs = pci_alloc_consistent(pdev, TX_BUF_TOT_LEN,
-                       &priv->tx_bufs_dma_addr);
+       priv->tx_bufs = dma_alloc_coherent(&pdev->dev, TX_BUF_TOT_LEN,
+                                          &priv->tx_bufs_dma_addr, GFP_KERNEL);
        if (unlikely(!priv->tx_bufs)) {
                err = -ENOMEM;
                goto out_alloc_tx_bufs;
@@ -1031,11 +1031,11 @@ static int sc92031_open(struct net_device *dev)
        return 0;
 
 out_request_irq:
-       pci_free_consistent(pdev, TX_BUF_TOT_LEN, priv->tx_bufs,
-                       priv->tx_bufs_dma_addr);
+       dma_free_coherent(&pdev->dev, TX_BUF_TOT_LEN, priv->tx_bufs,
+                         priv->tx_bufs_dma_addr);
 out_alloc_tx_bufs:
-       pci_free_consistent(pdev, RX_BUF_LEN, priv->rx_ring,
-                       priv->rx_ring_dma_addr);
+       dma_free_coherent(&pdev->dev, RX_BUF_LEN, priv->rx_ring,
+                         priv->rx_ring_dma_addr);
 out_alloc_rx_ring:
        return err;
 }
@@ -1058,10 +1058,10 @@ static int sc92031_stop(struct net_device *dev)
        spin_unlock_bh(&priv->lock);
 
        free_irq(pdev->irq, dev);
-       pci_free_consistent(pdev, TX_BUF_TOT_LEN, priv->tx_bufs,
-                       priv->tx_bufs_dma_addr);
-       pci_free_consistent(pdev, RX_BUF_LEN, priv->rx_ring,
-                       priv->rx_ring_dma_addr);
+       dma_free_coherent(&pdev->dev, TX_BUF_TOT_LEN, priv->tx_bufs,
+                         priv->tx_bufs_dma_addr);
+       dma_free_coherent(&pdev->dev, RX_BUF_LEN, priv->rx_ring,
+                         priv->rx_ring_dma_addr);
 
        return 0;
 }
@@ -1407,11 +1407,11 @@ static int sc92031_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        pci_set_master(pdev);
 
-       err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+       err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
        if (unlikely(err < 0))
                goto out_set_dma_mask;
 
-       err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
+       err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
        if (unlikely(err < 0))
                goto out_set_dma_mask;