Skip to content

Commit a2e7596

Browse files
tititiou36nbd168
authored andcommitted
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 <[email protected]> Signed-off-by: Felix Fietkau <[email protected]>
1 parent 4fb0a7d commit a2e7596

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ mt76pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
2828

2929
pci_set_master(pdev);
3030

31-
ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
31+
ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
3232
if (ret)
3333
return ret;
3434

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ static int mt7615_pci_probe(struct pci_dev *pdev,
3939
if (ret < 0)
4040
return ret;
4141

42-
ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
42+
ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
4343
if (ret)
4444
goto error;
4545

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id)
176176

177177
pci_set_master(pdev);
178178

179-
ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
179+
ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
180180
if (ret)
181181
return ret;
182182

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ mt76x2e_probe(struct pci_dev *pdev, const struct pci_device_id *id)
4747

4848
pci_set_master(pdev);
4949

50-
ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
50+
ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
5151
if (ret)
5252
return ret;
5353

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ static int mt7915_pci_probe(struct pci_dev *pdev,
250250

251251
pci_set_master(pdev);
252252

253-
ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
253+
ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
254254
if (ret)
255255
return ret;
256256

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev,
132132
if (ret < 0)
133133
return ret;
134134

135-
ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
135+
ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
136136
if (ret)
137137
goto err_free_pci_vec;
138138

0 commit comments

Comments
 (0)