Messages in this thread Patch in this message | | | From | Alexandre Bounine <> | Subject | [PATCH 04/11] media/video: add new context parameter for DMA_SLAVE calls | Date | Thu, 2 Feb 2012 16:32:14 -0500 |
| |
Fixup for calls affected by adding the new context parameter to DMA_SLAVE and DMA_CYCLIC interfaces.
Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Alberto Panizzo <maramaopercheseimorto@gmail.com> Cc: Samuel Ortiz <sameo@linux.intel.com> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/media/video/mx3_camera.c | 2 +- drivers/media/video/timblogiw.c | 2 +- drivers/video/mx3fb.c | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index 7452277..60b64ed4 100644 --- a/drivers/media/video/mx3_camera.c +++ b/drivers/media/video/mx3_camera.c @@ -288,7 +288,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb) txd = ichan->dma_chan.device->device_prep_slave_sg( &ichan->dma_chan, sg, 1, DMA_DEV_TO_MEM, - DMA_PREP_INTERRUPT); + DMA_PREP_INTERRUPT, NULL); if (!txd) goto error; diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c index 4ed1c7c2..14aa89d 100644 --- a/drivers/media/video/timblogiw.c +++ b/drivers/media/video/timblogiw.c @@ -566,7 +566,7 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) desc = fh->chan->device->device_prep_slave_sg(fh->chan, buf->sg, sg_elems, DMA_DEV_TO_MEM, - DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP); + DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP, NULL); if (!desc) { spin_lock_irq(&fh->queue_lock); list_del_init(&vb->queue); diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index 727a514..81a33ae 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c @@ -338,7 +338,8 @@ static void sdc_enable_channel(struct mx3fb_info *mx3_fbi) /* This enables the channel */ if (mx3_fbi->cookie < 0) { mx3_fbi->txd = dma_chan->device->device_prep_slave_sg(dma_chan, - &mx3_fbi->sg[0], 1, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT); + &mx3_fbi->sg[0], 1, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT, + NULL); if (!mx3_fbi->txd) { dev_err(mx3fb->dev, "Cannot allocate descriptor on %d\n", dma_chan->chan_id); @@ -1092,7 +1093,8 @@ static int mx3fb_pan_display(struct fb_var_screeninfo *var, async_tx_ack(mx3_fbi->txd); txd = dma_chan->device->device_prep_slave_sg(dma_chan, sg + - mx3_fbi->cur_ipu_buf, 1, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT); + mx3_fbi->cur_ipu_buf, 1, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT, + NULL); if (!txd) { dev_err(fbi->device, "Error preparing a DMA transaction descriptor.\n"); -- 1.7.8.4
| |