Commit 2c762ee5 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Kalle Valo
Browse files

adm8211: 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 'adm8211_alloc_rings()', GFP_KERNEL can be used
because it is called only from the probe function and no lock is acquired.
Moreover, GFP_KERNEL is already used just a few lines above in a kmalloc.

@@
@@
-    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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200806210431.736050-1-christophe.jaillet@wanadoo.fr
parent 86c96422

drivers/net/wireless/admtek/adm8211.c

+40 −43
Original line number Diff line number Diff line
@@ -324,8 +324,8 @@ static void adm8211_interrupt_tci(struct ieee80211_hw *dev) 


		/* TODO: check TDES0_STATUS_TUF and TDES0_STATUS_TRO */



		pci_unmap_single(priv->pdev, info->mapping,

				 info->skb->len, PCI_DMA_TODEVICE);

		dma_unmap_single(&priv->pdev->dev, info->mapping,

				 info->skb->len, DMA_TO_DEVICE);



		ieee80211_tx_info_clear_status(txi);
@@ -382,34 +382,33 @@ static void adm8211_interrupt_rci(struct ieee80211_hw *dev) 
		} else if (pktlen < RX_COPY_BREAK) {

			skb = dev_alloc_skb(pktlen);

			if (skb) {

				pci_dma_sync_single_for_cpu(

					priv->pdev,

				dma_sync_single_for_cpu(&priv->pdev->dev,

							priv->rx_buffers[entry].mapping,

					pktlen, PCI_DMA_FROMDEVICE);

							pktlen,

							DMA_FROM_DEVICE);

				skb_put_data(skb,

					     skb_tail_pointer(priv->rx_buffers[entry].skb),

					     pktlen);

				pci_dma_sync_single_for_device(

					priv->pdev,

				dma_sync_single_for_device(&priv->pdev->dev,

							   priv->rx_buffers[entry].mapping,

					RX_PKT_SIZE, PCI_DMA_FROMDEVICE);

							   RX_PKT_SIZE,

							   DMA_FROM_DEVICE);

			}

		} else {

			newskb = dev_alloc_skb(RX_PKT_SIZE);

			if (newskb) {

				skb = priv->rx_buffers[entry].skb;

				skb_put(skb, pktlen);

				pci_unmap_single(

					priv->pdev,

				dma_unmap_single(&priv->pdev->dev,

						 priv->rx_buffers[entry].mapping,

					RX_PKT_SIZE, PCI_DMA_FROMDEVICE);

						 RX_PKT_SIZE, DMA_FROM_DEVICE);

				priv->rx_buffers[entry].skb = newskb;

				priv->rx_buffers[entry].mapping =

					pci_map_single(priv->pdev,

					dma_map_single(&priv->pdev->dev,

						       skb_tail_pointer(newskb),

						       RX_PKT_SIZE,

						       PCI_DMA_FROMDEVICE);

				if (pci_dma_mapping_error(priv->pdev,

						       DMA_FROM_DEVICE);

				if (dma_mapping_error(&priv->pdev->dev,

						      priv->rx_buffers[entry].mapping)) {

					priv->rx_buffers[entry].skb = NULL;

					dev_kfree_skb(newskb);
@@ -1449,11 +1448,11 @@ static int adm8211_init_rings(struct ieee80211_hw *dev) 
		rx_info->skb = dev_alloc_skb(RX_PKT_SIZE);

		if (rx_info->skb == NULL)

			break;

		rx_info->mapping = pci_map_single(priv->pdev,

		rx_info->mapping = dma_map_single(&priv->pdev->dev,

						  skb_tail_pointer(rx_info->skb),

						  RX_PKT_SIZE,

						  PCI_DMA_FROMDEVICE);

		if (pci_dma_mapping_error(priv->pdev, rx_info->mapping)) {

						  DMA_FROM_DEVICE);

		if (dma_mapping_error(&priv->pdev->dev, rx_info->mapping)) {

			dev_kfree_skb(rx_info->skb);

			rx_info->skb = NULL;

			break;
@@ -1490,10 +1489,9 @@ static void adm8211_free_rings(struct ieee80211_hw *dev) 
		if (!priv->rx_buffers[i].skb)

			continue;



		pci_unmap_single(

			priv->pdev,

			priv->rx_buffers[i].mapping,

			RX_PKT_SIZE, PCI_DMA_FROMDEVICE);

		dma_unmap_single(&priv->pdev->dev,

				 priv->rx_buffers[i].mapping, RX_PKT_SIZE,

				 DMA_FROM_DEVICE);



		dev_kfree_skb(priv->rx_buffers[i].skb);

	}
@@ -1502,10 +1500,9 @@ static void adm8211_free_rings(struct ieee80211_hw *dev) 
		if (!priv->tx_buffers[i].skb)

			continue;



		pci_unmap_single(priv->pdev,

		dma_unmap_single(&priv->pdev->dev,

				 priv->tx_buffers[i].mapping,

				 priv->tx_buffers[i].skb->len,

				 PCI_DMA_TODEVICE);

				 priv->tx_buffers[i].skb->len, DMA_TO_DEVICE);



		dev_kfree_skb(priv->tx_buffers[i].skb);

	}
@@ -1632,9 +1629,9 @@ static int adm8211_tx_raw(struct ieee80211_hw *dev, struct sk_buff *skb, 
	unsigned int entry;

	u32 flag;



	mapping = pci_map_single(priv->pdev, skb->data, skb->len,

				 PCI_DMA_TODEVICE);

	if (pci_dma_mapping_error(priv->pdev, mapping))

	mapping = dma_map_single(&priv->pdev->dev, skb->data, skb->len,

				 DMA_TO_DEVICE);

	if (dma_mapping_error(&priv->pdev->dev, mapping))

		return -ENOMEM;



	spin_lock_irqsave(&priv->lock, flags);
@@ -1745,8 +1742,8 @@ static int adm8211_alloc_rings(struct ieee80211_hw *dev) 
	/* Allocate TX/RX descriptors */

	ring_size = sizeof(struct adm8211_desc) * priv->rx_ring_size +

		    sizeof(struct adm8211_desc) * priv->tx_ring_size;

	priv->rx_ring = pci_alloc_consistent(priv->pdev, ring_size,

					     &priv->rx_ring_dma);

	priv->rx_ring = dma_alloc_coherent(&priv->pdev->dev, ring_size,

					   &priv->rx_ring_dma, GFP_KERNEL);



	if (!priv->rx_ring) {

		kfree(priv->rx_buffers);
@@ -1818,8 +1815,8 @@ static int adm8211_probe(struct pci_dev *pdev, 
		return err; /* someone else grabbed it? don't disable it */

	}



	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) ||

	    pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {

	if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)) ||

	    dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32))) {

		printk(KERN_ERR "%s (adm8211): No suitable DMA available\n",

		       pci_name(pdev));

		goto err_free_reg;
@@ -1929,7 +1926,7 @@ static int adm8211_probe(struct pci_dev *pdev, 
	kfree(priv->eeprom);



 err_free_desc:

	pci_free_consistent(pdev,

	dma_free_coherent(&pdev->dev,

			  sizeof(struct adm8211_desc) * priv->rx_ring_size +

			  sizeof(struct adm8211_desc) * priv->tx_ring_size,

			  priv->rx_ring, priv->rx_ring_dma);
@@ -1962,7 +1959,7 @@ static void adm8211_remove(struct pci_dev *pdev) 


	priv = dev->priv;



	pci_free_consistent(pdev,

	dma_free_coherent(&pdev->dev,

			  sizeof(struct adm8211_desc) * priv->rx_ring_size +

			  sizeof(struct adm8211_desc) * priv->tx_ring_size,

			  priv->rx_ring, priv->rx_ring_dma);