Commit 873a623f authored Jan 15, 2021 by Christophe JAILLET Committed by Mauro Carvalho Chehab Jan 27, 2021

media: saa7164: 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 and has been
hand modified to replace GFP_ with a correct flag.
It has been compile tested.

When memory is allocated in 'saa7164_buffer_alloc()' GFP_KERNEL can be used
because this function is already using this flag just a few lines above.

@@
@@
-    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: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent 204cffaf

drivers/media/pci/saa7164/saa7164-buffer.c

+9 −7

Original line number	Diff line number	Diff line
		@@ -103,13 +103,13 @@ struct saa7164_buffer saa7164_buffer_alloc(struct saa7164_port port,
		buf->pt_size = (SAA7164_PT_ENTRIES * sizeof(u64)) + 0x1000;

		/* Allocate contiguous memory */
		buf->cpu = pci_alloc_consistent(port->dev->pci, buf->pci_size,
		&buf->dma);
		buf->cpu = dma_alloc_coherent(&port->dev->pci->dev, buf->pci_size,
		&buf->dma, GFP_KERNEL);
		if (!buf->cpu)
		goto fail1;

		buf->pt_cpu = pci_alloc_consistent(port->dev->pci, buf->pt_size,
		&buf->pt_dma);
		buf->pt_cpu = dma_alloc_coherent(&port->dev->pci->dev, buf->pt_size,
		&buf->pt_dma, GFP_KERNEL);
		if (!buf->pt_cpu)
		goto fail2;

		@@ -137,7 +137,8 @@ struct saa7164_buffer saa7164_buffer_alloc(struct saa7164_port port,
		goto ret;

		fail2:
		pci_free_consistent(port->dev->pci, buf->pci_size, buf->cpu, buf->dma);
		dma_free_coherent(&port->dev->pci->dev, buf->pci_size, buf->cpu,
		buf->dma);
		fail1:
		kfree(buf);

		@@ -160,8 +161,9 @@ int saa7164_buffer_dealloc(struct saa7164_buffer *buf)
		if (buf->flags != SAA7164_BUFFER_FREE)
		log_warn(" freeing a non-free buffer\n");

		pci_free_consistent(dev->pci, buf->pci_size, buf->cpu, buf->dma);
		pci_free_consistent(dev->pci, buf->pt_size, buf->pt_cpu, buf->pt_dma);
		dma_free_coherent(&dev->pci->dev, buf->pci_size, buf->cpu, buf->dma);
		dma_free_coherent(&dev->pci->dev, buf->pt_size, buf->pt_cpu,
		buf->pt_dma);

		kfree(buf);

drivers/media/pci/saa7164/saa7164-core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1273,7 +1273,7 @@ static int saa7164_initdev(struct pci_dev *pci_dev,

		pci_set_master(pci_dev);
		/* TODO */
		err = pci_set_dma_mask(pci_dev, 0xffffffff);
		err = dma_set_mask(&pci_dev->dev, 0xffffffff);
		if (err) {
		printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
		goto fail_irq;