Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1003cab8 authored by Vinod Koul's avatar Vinod Koul
Browse files

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: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent 20dd5a35

drivers/media/video/mx3_camera.c

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static int mx3_videobuf_prepare(struct vb2_buffer *vb) 
		sg_dma_len(sg)		= new_size;



		buf->txd = ichan->dma_chan.device->device_prep_slave_sg(

			&ichan->dma_chan, sg, 1, DMA_FROM_DEVICE,

			&ichan->dma_chan, sg, 1, DMA_DEV_TO_MEM,

			DMA_PREP_INTERRUPT);

		if (!buf->txd)

			return -EIO;

drivers/media/video/timblogiw.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) 
	spin_unlock_irq(&fh->queue_lock);



	desc = fh->chan->device->device_prep_slave_sg(fh->chan,

		buf->sg, sg_elems, DMA_FROM_DEVICE,

		buf->sg, sg_elems, DMA_DEV_TO_MEM,

		DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);

	if (!desc) {

		spin_lock_irq(&fh->queue_lock);

drivers/video/mx3fb.c

+2 −2
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ 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_TO_DEVICE, DMA_PREP_INTERRUPT);

		      &mx3_fbi->sg[0], 1, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT);

		if (!mx3_fbi->txd) {

			dev_err(mx3fb->dev, "Cannot allocate descriptor on %d\n",

				dma_chan->chan_id);
@@ -1104,7 +1104,7 @@ 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_TO_DEVICE, DMA_PREP_INTERRUPT);

		mx3_fbi->cur_ipu_buf, 1, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT);

	if (!txd) {

		dev_err(fbi->device,

			"Error preparing a DMA transaction descriptor.\n");