diff options
author | Vinod Koul <vinod.koul@linux.intel.com> | 2011-10-14 01:09:23 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@linux.intel.com> | 2011-10-31 00:10:15 -0400 |
commit | 1003cab8276cd34d9deab8ca9d148ee59f7728a7 (patch) | |
tree | a680ab4f07b3cede8f10b6e3876f28b4f337a83f | |
parent | 20dd5a356efcb5bf574baa9adccc775158f13ae1 (diff) |
media, video: move to dma_transfer_direction
fixup usage of dma direction by introducing dma_transfer_direction,
this patch moves media and video drivers to use new enum
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
-rw-r--r-- | drivers/media/video/mx3_camera.c | 2 | ||||
-rw-r--r-- | drivers/media/video/timblogiw.c | 2 | ||||
-rw-r--r-- | drivers/video/mx3fb.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index c045b47803ad..ec98eae20cd8 100644 --- a/drivers/media/video/mx3_camera.c +++ b/drivers/media/video/mx3_camera.c | |||
@@ -251,7 +251,7 @@ static int mx3_videobuf_prepare(struct vb2_buffer *vb) | |||
251 | sg_dma_len(sg) = new_size; | 251 | sg_dma_len(sg) = new_size; |
252 | 252 | ||
253 | buf->txd = ichan->dma_chan.device->device_prep_slave_sg( | 253 | buf->txd = ichan->dma_chan.device->device_prep_slave_sg( |
254 | &ichan->dma_chan, sg, 1, DMA_FROM_DEVICE, | 254 | &ichan->dma_chan, sg, 1, DMA_DEV_TO_MEM, |
255 | DMA_PREP_INTERRUPT); | 255 | DMA_PREP_INTERRUPT); |
256 | if (!buf->txd) | 256 | if (!buf->txd) |
257 | return -EIO; | 257 | return -EIO; |
diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c index 84cd1b65b765..d542c8b9e2f4 100644 --- a/drivers/media/video/timblogiw.c +++ b/drivers/media/video/timblogiw.c | |||
@@ -564,7 +564,7 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) | |||
564 | spin_unlock_irq(&fh->queue_lock); | 564 | spin_unlock_irq(&fh->queue_lock); |
565 | 565 | ||
566 | desc = fh->chan->device->device_prep_slave_sg(fh->chan, | 566 | desc = fh->chan->device->device_prep_slave_sg(fh->chan, |
567 | buf->sg, sg_elems, DMA_FROM_DEVICE, | 567 | buf->sg, sg_elems, DMA_DEV_TO_MEM, |
568 | DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP); | 568 | DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP); |
569 | if (!desc) { | 569 | if (!desc) { |
570 | spin_lock_irq(&fh->queue_lock); | 570 | spin_lock_irq(&fh->queue_lock); |
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index 7e3a490e8d76..e2caf884fe31 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c | |||
@@ -334,7 +334,7 @@ static void sdc_enable_channel(struct mx3fb_info *mx3_fbi) | |||
334 | /* This enables the channel */ | 334 | /* This enables the channel */ |
335 | if (mx3_fbi->cookie < 0) { | 335 | if (mx3_fbi->cookie < 0) { |
336 | mx3_fbi->txd = dma_chan->device->device_prep_slave_sg(dma_chan, | 336 | mx3_fbi->txd = dma_chan->device->device_prep_slave_sg(dma_chan, |
337 | &mx3_fbi->sg[0], 1, DMA_TO_DEVICE, DMA_PREP_INTERRUPT); | 337 | &mx3_fbi->sg[0], 1, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT); |
338 | if (!mx3_fbi->txd) { | 338 | if (!mx3_fbi->txd) { |
339 | dev_err(mx3fb->dev, "Cannot allocate descriptor on %d\n", | 339 | dev_err(mx3fb->dev, "Cannot allocate descriptor on %d\n", |
340 | dma_chan->chan_id); | 340 | dma_chan->chan_id); |
@@ -1104,7 +1104,7 @@ static int mx3fb_pan_display(struct fb_var_screeninfo *var, | |||
1104 | async_tx_ack(mx3_fbi->txd); | 1104 | async_tx_ack(mx3_fbi->txd); |
1105 | 1105 | ||
1106 | txd = dma_chan->device->device_prep_slave_sg(dma_chan, sg + | 1106 | txd = dma_chan->device->device_prep_slave_sg(dma_chan, sg + |
1107 | mx3_fbi->cur_ipu_buf, 1, DMA_TO_DEVICE, DMA_PREP_INTERRUPT); | 1107 | mx3_fbi->cur_ipu_buf, 1, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT); |
1108 | if (!txd) { | 1108 | if (!txd) { |
1109 | dev_err(fbi->device, | 1109 | dev_err(fbi->device, |
1110 | "Error preparing a DMA transaction descriptor.\n"); | 1110 | "Error preparing a DMA transaction descriptor.\n"); |