Commit 89d74b30 authored Aug 21, 2021 by Christophe JAILLET Committed by Ulf Hansson Aug 24, 2021

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

No memory allocation in involved in this patch, so no GFP_ tweak is needed.

@@ @@
-    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/f6fe24f2372c8c627a08ace7187bfe60d35788b6.1629580314.git.christophe.jaillet@wanadoo.fr


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

parent 2b50c81f

drivers/memstick/host/r592.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -293,7 +293,7 @@ static int r592_transfer_fifo_dma(struct r592_device *dev)

		/* TODO: hidden assumption about nenth beeing always 1 */
		sg_count = dma_map_sg(&dev->pci_dev->dev, &dev->req->sg, 1, is_write ?
		PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE);
		DMA_TO_DEVICE : DMA_FROM_DEVICE);

		if (sg_count != 1 \|\| sg_dma_len(&dev->req->sg) < R592_LFIFO_SIZE) {
		message("problem in dma_map_sg");
		@@ -310,8 +310,7 @@ static int r592_transfer_fifo_dma(struct r592_device *dev)
		}

		dma_unmap_sg(&dev->pci_dev->dev, &dev->req->sg, 1, is_write ?
		PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE);

		DMA_TO_DEVICE : DMA_FROM_DEVICE);

		return dev->dma_error;
		}

drivers/memstick/host/tifm_ms.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -279,8 +279,8 @@ static int tifm_ms_issue_cmd(struct tifm_ms *host)
		if (host->use_dma) {
		if (1 != tifm_map_sg(sock, &host->req->sg, 1,
		host->req->data_dir == READ
		? PCI_DMA_FROMDEVICE
		: PCI_DMA_TODEVICE)) {
		? DMA_FROM_DEVICE
		: DMA_TO_DEVICE)) {
		host->req->error = -ENOMEM;
		return host->req->error;
		}
		@@ -350,8 +350,8 @@ static void tifm_ms_complete_cmd(struct tifm_ms *host)
		if (host->use_dma) {
		tifm_unmap_sg(sock, &host->req->sg, 1,
		host->req->data_dir == READ
		? PCI_DMA_FROMDEVICE
		: PCI_DMA_TODEVICE);
		? DMA_FROM_DEVICE
		: DMA_TO_DEVICE);
		}

		writel((~TIFM_CTRL_LED) & readl(sock->addr + SOCK_CONTROL),
		@@ -607,8 +607,8 @@ static void tifm_ms_remove(struct tifm_dev *sock)
		if (host->use_dma)
		tifm_unmap_sg(sock, &host->req->sg, 1,
		host->req->data_dir == READ
		? PCI_DMA_TODEVICE
		: PCI_DMA_FROMDEVICE);
		? DMA_TO_DEVICE
		: DMA_FROM_DEVICE);
		host->req->error = -ETIME;

		do {