Commit a2e75961 authored Aug 22, 2021 by Christophe JAILLET Committed by Felix Fietkau Oct 20, 2021

mt76: 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.

It has been compile tested.

@@
@@
-    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: Felix Fietkau <nbd@nbd.name>

parent 4fb0a7d2

drivers/net/wireless/mediatek/mt76/mt7603/pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ mt76pci_probe(struct pci_dev pdev, const struct pci_device_id id)

		pci_set_master(pdev);

		ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
		ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
		if (ret)
		return ret;

drivers/net/wireless/mediatek/mt76/mt7615/pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ static int mt7615_pci_probe(struct pci_dev *pdev,
		if (ret < 0)
		return ret;

		ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
		ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
		if (ret)
		goto error;

drivers/net/wireless/mediatek/mt76/mt76x0/pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -176,7 +176,7 @@ mt76x0e_probe(struct pci_dev pdev, const struct pci_device_id id)

		pci_set_master(pdev);

		ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
		ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
		if (ret)
		return ret;

drivers/net/wireless/mediatek/mt76/mt76x2/pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ mt76x2e_probe(struct pci_dev pdev, const struct pci_device_id id)

		pci_set_master(pdev);

		ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
		ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
		if (ret)
		return ret;

drivers/net/wireless/mediatek/mt76/mt7915/pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -250,7 +250,7 @@ static int mt7915_pci_probe(struct pci_dev *pdev,

		pci_set_master(pdev);

		ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
		ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
		if (ret)
		return ret;