Commit 887069f4 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Mauro Carvalho Chehab
Browse files

media: 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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: default avatarAkihiro Tsukada <tskd08@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 1932dc2f

drivers/media/pci/cobalt/cobalt-driver.c

+2 −2
Original line number Diff line number Diff line
@@ -332,8 +332,8 @@ static int cobalt_setup_pci(struct cobalt *cobalt, struct pci_dev *pci_dev, 
		}

	}



	if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(64))) {

		ret = pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32));

	if (dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(64))) {

		ret = dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32));

		if (ret) {

			cobalt_err("no suitable DMA available\n");

			goto err_disable;

drivers/media/pci/cx18/cx18-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *pci_dev, 
		CX18_ERR("Can't enable device %d!\n", cx->instance);

		return -EIO;

	}

	if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) {

	if (dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32))) {

		CX18_ERR("No suitable DMA available, card %d\n", cx->instance);

		return -EIO;

	}

drivers/media/pci/cx18/cx18-queue.c

+7 −6
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ void _cx18_mdl_sync_for_device(struct cx18_stream *s, struct cx18_mdl *mdl) 
	struct cx18_buffer *buf;



	list_for_each_entry(buf, &mdl->buf_list, list)

		pci_dma_sync_single_for_device(pci_dev, buf->dma_handle,

		dma_sync_single_for_device(&pci_dev->dev, buf->dma_handle,

					   buf_size, dma);

}
@@ -385,8 +385,9 @@ int cx18_stream_alloc(struct cx18_stream *s) 
		cx18_enqueue(s, mdl, &s->q_idle);



		INIT_LIST_HEAD(&buf->list);

		buf->dma_handle = pci_map_single(s->cx->pci_dev,

				buf->buf, s->buf_size, s->dma);

		buf->dma_handle = dma_map_single(&s->cx->pci_dev->dev,

						 buf->buf, s->buf_size,

						 s->dma);

		cx18_buf_sync_for_cpu(s, buf);

		list_add_tail(&buf->list, &s->buf_pool);

	}
@@ -419,7 +420,7 @@ void cx18_stream_free(struct cx18_stream *s) 
		buf = list_first_entry(&s->buf_pool, struct cx18_buffer, list);

		list_del_init(&buf->list);



		pci_unmap_single(s->cx->pci_dev, buf->dma_handle,

		dma_unmap_single(&s->cx->pci_dev->dev, buf->dma_handle,

				 s->buf_size, s->dma);

		kfree(buf->buf);

		kfree(buf);

drivers/media/pci/cx18/cx18-streams.c

+8 −8
Original line number Diff line number Diff line
@@ -49,44 +49,44 @@ static struct { 
	{	/* CX18_ENC_STREAM_TYPE_MPG */

		"encoder MPEG",

		VFL_TYPE_VIDEO, 0,

		PCI_DMA_FROMDEVICE,

		DMA_FROM_DEVICE,

		V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |

		V4L2_CAP_AUDIO | V4L2_CAP_TUNER

	},

	{	/* CX18_ENC_STREAM_TYPE_TS */

		"TS",

		VFL_TYPE_VIDEO, -1,

		PCI_DMA_FROMDEVICE,

		DMA_FROM_DEVICE,

	},

	{	/* CX18_ENC_STREAM_TYPE_YUV */

		"encoder YUV",

		VFL_TYPE_VIDEO, CX18_V4L2_ENC_YUV_OFFSET,

		PCI_DMA_FROMDEVICE,

		DMA_FROM_DEVICE,

		V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |

		V4L2_CAP_STREAMING | V4L2_CAP_AUDIO | V4L2_CAP_TUNER

	},

	{	/* CX18_ENC_STREAM_TYPE_VBI */

		"encoder VBI",

		VFL_TYPE_VBI, 0,

		PCI_DMA_FROMDEVICE,

		DMA_FROM_DEVICE,

		V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE |

		V4L2_CAP_READWRITE | V4L2_CAP_TUNER

	},

	{	/* CX18_ENC_STREAM_TYPE_PCM */

		"encoder PCM audio",

		VFL_TYPE_VIDEO, CX18_V4L2_ENC_PCM_OFFSET,

		PCI_DMA_FROMDEVICE,

		DMA_FROM_DEVICE,

		V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,

	},

	{	/* CX18_ENC_STREAM_TYPE_IDX */

		"encoder IDX",

		VFL_TYPE_VIDEO, -1,

		PCI_DMA_FROMDEVICE,

		DMA_FROM_DEVICE,

	},

	{	/* CX18_ENC_STREAM_TYPE_RAD */

		"encoder radio",

		VFL_TYPE_RADIO, 0,

		PCI_DMA_NONE,

		DMA_NONE,

		V4L2_CAP_RADIO | V4L2_CAP_TUNER

	},

};
@@ -324,7 +324,7 @@ static int cx18_prep_dev(struct cx18 *cx, int type) 


	/* User explicitly selected 0 buffers for these streams, so don't

	   create them. */

	if (cx18_stream_info[type].dma != PCI_DMA_NONE &&

	if (cx18_stream_info[type].dma != DMA_NONE &&

	    cx->stream_buffers[type] == 0) {

		CX18_INFO("Disabled %s device\n", cx18_stream_info[type].name);

		return 0;

drivers/media/pci/ddbridge/ddbridge-main.c

+2 −2
Original line number Diff line number Diff line
@@ -180,8 +180,8 @@ static int ddb_probe(struct pci_dev *pdev, 


	pci_set_master(pdev);



	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64)))

		if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))

	if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)))

		if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)))

			return -ENODEV;



	dev = vzalloc(sizeof(*dev));