tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: Akihiro Tsukada <tskd08@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

authored by

Christophe JAILLET and committed by
Mauro Carvalho Chehab 887069f4 1932dc2f

+34 -33
+2 -2
drivers/media/pci/cobalt/cobalt-driver.c
··· 332 332 } 333 333 } 334 334 335 - if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(64))) { 336 - ret = pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32)); 335 + if (dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(64))) { 336 + ret = dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32)); 337 337 if (ret) { 338 338 cobalt_err("no suitable DMA available\n"); 339 339 goto err_disable;
+1 -1
drivers/media/pci/cx18/cx18-driver.c
··· 804 804 CX18_ERR("Can't enable device %d!\n", cx->instance); 805 805 return -EIO; 806 806 } 807 - if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) { 807 + if (dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32))) { 808 808 CX18_ERR("No suitable DMA available, card %d\n", cx->instance); 809 809 return -EIO; 810 810 }
+7 -6
drivers/media/pci/cx18/cx18-queue.c
··· 325 325 struct cx18_buffer *buf; 326 326 327 327 list_for_each_entry(buf, &mdl->buf_list, list) 328 - pci_dma_sync_single_for_device(pci_dev, buf->dma_handle, 329 - buf_size, dma); 328 + dma_sync_single_for_device(&pci_dev->dev, buf->dma_handle, 329 + buf_size, dma); 330 330 } 331 331 332 332 int cx18_stream_alloc(struct cx18_stream *s) ··· 385 385 cx18_enqueue(s, mdl, &s->q_idle); 386 386 387 387 INIT_LIST_HEAD(&buf->list); 388 - buf->dma_handle = pci_map_single(s->cx->pci_dev, 389 - buf->buf, s->buf_size, s->dma); 388 + buf->dma_handle = dma_map_single(&s->cx->pci_dev->dev, 389 + buf->buf, s->buf_size, 390 + s->dma); 390 391 cx18_buf_sync_for_cpu(s, buf); 391 392 list_add_tail(&buf->list, &s->buf_pool); 392 393 } ··· 420 419 buf = list_first_entry(&s->buf_pool, struct cx18_buffer, list); 421 420 list_del_init(&buf->list); 422 421 423 - pci_unmap_single(s->cx->pci_dev, buf->dma_handle, 424 - s->buf_size, s->dma); 422 + dma_unmap_single(&s->cx->pci_dev->dev, buf->dma_handle, 423 + s->buf_size, s->dma); 425 424 kfree(buf->buf); 426 425 kfree(buf); 427 426 }
+8 -8
drivers/media/pci/cx18/cx18-streams.c
··· 49 49 { /* CX18_ENC_STREAM_TYPE_MPG */ 50 50 "encoder MPEG", 51 51 VFL_TYPE_VIDEO, 0, 52 - PCI_DMA_FROMDEVICE, 52 + DMA_FROM_DEVICE, 53 53 V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | 54 54 V4L2_CAP_AUDIO | V4L2_CAP_TUNER 55 55 }, 56 56 { /* CX18_ENC_STREAM_TYPE_TS */ 57 57 "TS", 58 58 VFL_TYPE_VIDEO, -1, 59 - PCI_DMA_FROMDEVICE, 59 + DMA_FROM_DEVICE, 60 60 }, 61 61 { /* CX18_ENC_STREAM_TYPE_YUV */ 62 62 "encoder YUV", 63 63 VFL_TYPE_VIDEO, CX18_V4L2_ENC_YUV_OFFSET, 64 - PCI_DMA_FROMDEVICE, 64 + DMA_FROM_DEVICE, 65 65 V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | 66 66 V4L2_CAP_STREAMING | V4L2_CAP_AUDIO | V4L2_CAP_TUNER 67 67 }, 68 68 { /* CX18_ENC_STREAM_TYPE_VBI */ 69 69 "encoder VBI", 70 70 VFL_TYPE_VBI, 0, 71 - PCI_DMA_FROMDEVICE, 71 + DMA_FROM_DEVICE, 72 72 V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE | 73 73 V4L2_CAP_READWRITE | V4L2_CAP_TUNER 74 74 }, 75 75 { /* CX18_ENC_STREAM_TYPE_PCM */ 76 76 "encoder PCM audio", 77 77 VFL_TYPE_VIDEO, CX18_V4L2_ENC_PCM_OFFSET, 78 - PCI_DMA_FROMDEVICE, 78 + DMA_FROM_DEVICE, 79 79 V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE, 80 80 }, 81 81 { /* CX18_ENC_STREAM_TYPE_IDX */ 82 82 "encoder IDX", 83 83 VFL_TYPE_VIDEO, -1, 84 - PCI_DMA_FROMDEVICE, 84 + DMA_FROM_DEVICE, 85 85 }, 86 86 { /* CX18_ENC_STREAM_TYPE_RAD */ 87 87 "encoder radio", 88 88 VFL_TYPE_RADIO, 0, 89 - PCI_DMA_NONE, 89 + DMA_NONE, 90 90 V4L2_CAP_RADIO | V4L2_CAP_TUNER 91 91 }, 92 92 }; ··· 324 324 325 325 /* User explicitly selected 0 buffers for these streams, so don't 326 326 create them. */ 327 - if (cx18_stream_info[type].dma != PCI_DMA_NONE && 327 + if (cx18_stream_info[type].dma != DMA_NONE && 328 328 cx->stream_buffers[type] == 0) { 329 329 CX18_INFO("Disabled %s device\n", cx18_stream_info[type].name); 330 330 return 0;
+2 -2
drivers/media/pci/ddbridge/ddbridge-main.c
··· 180 180 181 181 pci_set_master(pdev); 182 182 183 - if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) 184 - if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) 183 + if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) 184 + if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) 185 185 return -ENODEV; 186 186 187 187 dev = vzalloc(sizeof(*dev));
+1 -1
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
··· 1752 1752 1753 1753 pci_set_master(pci_dev); 1754 1754 1755 - r = pci_set_dma_mask(pci_dev, CIO2_DMA_MASK); 1755 + r = dma_set_mask(&pci_dev->dev, CIO2_DMA_MASK); 1756 1756 if (r) { 1757 1757 dev_err(dev, "failed to set DMA mask (%d)\n", r); 1758 1758 return -ENODEV;
+1 -1
drivers/media/pci/netup_unidvb/netup_unidvb_core.c
··· 846 846 "%s(): board vendor 0x%x, revision 0x%x\n", 847 847 __func__, board_vendor, board_revision); 848 848 pci_set_master(pci_dev); 849 - if (pci_set_dma_mask(pci_dev, 0xffffffff) < 0) { 849 + if (dma_set_mask(&pci_dev->dev, 0xffffffff) < 0) { 850 850 dev_err(&pci_dev->dev, 851 851 "%s(): 32bit PCI DMA is not supported\n", __func__); 852 852 goto pci_detect_err;
+10 -10
drivers/media/pci/pluto2/pluto2.c
··· 228 228 229 229 static int pluto_dma_map(struct pluto *pluto) 230 230 { 231 - pluto->dma_addr = pci_map_single(pluto->pdev, pluto->dma_buf, 232 - TS_DMA_BYTES, PCI_DMA_FROMDEVICE); 231 + pluto->dma_addr = dma_map_single(&pluto->pdev->dev, pluto->dma_buf, 232 + TS_DMA_BYTES, DMA_FROM_DEVICE); 233 233 234 - return pci_dma_mapping_error(pluto->pdev, pluto->dma_addr); 234 + return dma_mapping_error(&pluto->pdev->dev, pluto->dma_addr); 235 235 } 236 236 237 237 static void pluto_dma_unmap(struct pluto *pluto) 238 238 { 239 - pci_unmap_single(pluto->pdev, pluto->dma_addr, 240 - TS_DMA_BYTES, PCI_DMA_FROMDEVICE); 239 + dma_unmap_single(&pluto->pdev->dev, pluto->dma_addr, TS_DMA_BYTES, 240 + DMA_FROM_DEVICE); 241 241 } 242 242 243 243 static int pluto_start_feed(struct dvb_demux_feed *f) ··· 276 276 { 277 277 /* synchronize the DMA transfer with the CPU 278 278 * first so that we see updated contents. */ 279 - pci_dma_sync_single_for_cpu(pluto->pdev, pluto->dma_addr, 280 - TS_DMA_BYTES, PCI_DMA_FROMDEVICE); 279 + dma_sync_single_for_cpu(&pluto->pdev->dev, pluto->dma_addr, 280 + TS_DMA_BYTES, DMA_FROM_DEVICE); 281 281 282 282 /* Workaround for broken hardware: 283 283 * [1] On startup NBPACKETS seems to contain an uninitialized value, ··· 310 310 pluto_set_dma_addr(pluto); 311 311 312 312 /* sync the buffer and give it back to the card */ 313 - pci_dma_sync_single_for_device(pluto->pdev, pluto->dma_addr, 314 - TS_DMA_BYTES, PCI_DMA_FROMDEVICE); 313 + dma_sync_single_for_device(&pluto->pdev->dev, pluto->dma_addr, 314 + TS_DMA_BYTES, DMA_FROM_DEVICE); 315 315 } 316 316 317 317 static irqreturn_t pluto_irq(int irq, void *dev_id) ··· 595 595 /* enable interrupts */ 596 596 pci_write_config_dword(pdev, 0x6c, 0x8000); 597 597 598 - ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); 598 + ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); 599 599 if (ret < 0) 600 600 goto err_pci_disable_device; 601 601
+1 -1
drivers/media/pci/pt1/pt1.c
··· 1340 1340 if (ret < 0) 1341 1341 goto err; 1342 1342 1343 - ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); 1343 + ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); 1344 1344 if (ret < 0) 1345 1345 goto err_pci_disable_device; 1346 1346
+1 -1
drivers/media/pci/tw5864/tw5864-core.c
··· 262 262 263 263 pci_set_master(pci_dev); 264 264 265 - err = pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32)); 265 + err = dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32)); 266 266 if (err) { 267 267 dev_err(&dev->pci->dev, "32 bit PCI DMA is not supported\n"); 268 268 goto disable_pci;