Commit b048457c authored Aug 22, 2021 by Christophe JAILLET Committed by Ulf Hansson Aug 24, 2021

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 <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/b617f284e2ab8b6b48fff150eba1638641646edd.1629640046.git.christophe.jaillet@wanadoo.fr


Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 89d74b30

drivers/mmc/host/tifm_sd.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -669,8 +669,8 @@ static void tifm_sd_request(struct mmc_host mmc, struct mmc_request mrq)

		if(1 != tifm_map_sg(sock, &host->bounce_buf, 1,
		r_data->flags & MMC_DATA_WRITE
		? PCI_DMA_TODEVICE
		: PCI_DMA_FROMDEVICE)) {
		? DMA_TO_DEVICE
		: DMA_FROM_DEVICE)) {
		pr_err("%s : scatterlist map failed\n",
		dev_name(&sock->dev));
		mrq->cmd->error = -ENOMEM;
		@@ -680,15 +680,15 @@ static void tifm_sd_request(struct mmc_host mmc, struct mmc_request mrq)
		r_data->sg_len,
		r_data->flags
		& MMC_DATA_WRITE
		? PCI_DMA_TODEVICE
		: PCI_DMA_FROMDEVICE);
		? DMA_TO_DEVICE
		: DMA_FROM_DEVICE);
		if (host->sg_len < 1) {
		pr_err("%s : scatterlist map failed\n",
		dev_name(&sock->dev));
		tifm_unmap_sg(sock, &host->bounce_buf, 1,
		r_data->flags & MMC_DATA_WRITE
		? PCI_DMA_TODEVICE
		: PCI_DMA_FROMDEVICE);
		? DMA_TO_DEVICE
		: DMA_FROM_DEVICE);
		mrq->cmd->error = -ENOMEM;
		goto err_out;
		}
		@@ -762,10 +762,10 @@ static void tifm_sd_end_cmd(struct tasklet_struct *t)
		} else {
		tifm_unmap_sg(sock, &host->bounce_buf, 1,
		(r_data->flags & MMC_DATA_WRITE)
		? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE);
		? DMA_TO_DEVICE : DMA_FROM_DEVICE);
		tifm_unmap_sg(sock, r_data->sg, r_data->sg_len,
		(r_data->flags & MMC_DATA_WRITE)
		? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE);
		? DMA_TO_DEVICE : DMA_FROM_DEVICE);
		}

		r_data->bytes_xfered = r_data->blocks

drivers/mmc/host/via-sdmmc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -491,7 +491,7 @@ static void via_sdc_preparedata(struct via_crdr_mmc_host *host,

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

		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)

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

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