Skip to content

Commit b048457

Browse files
tititiou36storulf
authored andcommitted
mmc: 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]> Link: https://lore.kernel.org/r/b617f284e2ab8b6b48fff150eba1638641646edd.1629640046.git.christophe.jaillet@wanadoo.fr Signed-off-by: Ulf Hansson <[email protected]>
1 parent 89d74b3 commit b048457

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

drivers/mmc/host/tifm_sd.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -669,8 +669,8 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
669669

670670
if(1 != tifm_map_sg(sock, &host->bounce_buf, 1,
671671
r_data->flags & MMC_DATA_WRITE
672-
? PCI_DMA_TODEVICE
673-
: PCI_DMA_FROMDEVICE)) {
672+
? DMA_TO_DEVICE
673+
: DMA_FROM_DEVICE)) {
674674
pr_err("%s : scatterlist map failed\n",
675675
dev_name(&sock->dev));
676676
mrq->cmd->error = -ENOMEM;
@@ -680,15 +680,15 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
680680
r_data->sg_len,
681681
r_data->flags
682682
& MMC_DATA_WRITE
683-
? PCI_DMA_TODEVICE
684-
: PCI_DMA_FROMDEVICE);
683+
? DMA_TO_DEVICE
684+
: DMA_FROM_DEVICE);
685685
if (host->sg_len < 1) {
686686
pr_err("%s : scatterlist map failed\n",
687687
dev_name(&sock->dev));
688688
tifm_unmap_sg(sock, &host->bounce_buf, 1,
689689
r_data->flags & MMC_DATA_WRITE
690-
? PCI_DMA_TODEVICE
691-
: PCI_DMA_FROMDEVICE);
690+
? DMA_TO_DEVICE
691+
: DMA_FROM_DEVICE);
692692
mrq->cmd->error = -ENOMEM;
693693
goto err_out;
694694
}
@@ -762,10 +762,10 @@ static void tifm_sd_end_cmd(struct tasklet_struct *t)
762762
} else {
763763
tifm_unmap_sg(sock, &host->bounce_buf, 1,
764764
(r_data->flags & MMC_DATA_WRITE)
765-
? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE);
765+
? DMA_TO_DEVICE : DMA_FROM_DEVICE);
766766
tifm_unmap_sg(sock, r_data->sg, r_data->sg_len,
767767
(r_data->flags & MMC_DATA_WRITE)
768-
? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE);
768+
? DMA_TO_DEVICE : DMA_FROM_DEVICE);
769769
}
770770

771771
r_data->bytes_xfered = r_data->blocks

drivers/mmc/host/via-sdmmc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ static void via_sdc_preparedata(struct via_crdr_mmc_host *host,
491491

492492
count = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
493493
((data->flags & MMC_DATA_READ) ?
494-
PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE));
494+
DMA_FROM_DEVICE : DMA_TO_DEVICE));
495495
BUG_ON(count != 1);
496496

497497
via_set_ddma(host, sg_dma_address(data->sg), sg_dma_len(data->sg),
@@ -638,7 +638,7 @@ static void via_sdc_finish_data(struct via_crdr_mmc_host *host)
638638

639639
dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
640640
((data->flags & MMC_DATA_READ) ?
641-
PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE));
641+
DMA_FROM_DEVICE : DMA_TO_DEVICE));
642642

643643
if (data->stop)
644644
via_sdc_send_command(host, data->stop);

0 commit comments

Comments
 (0)