Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine

Pull dmaengine changes from Dan

1/ Bartlomiej and Dan finalized a rework of the dma address unmap
   implementation.

2/ In the course of testing 1/ a collection of enhancements to dmatest
   fell out.  Notably basic performance statistics, and fixed / enhanced
   test control through new module parameters 'run', 'wait', 'noverify',
   and 'verbose'.  Thanks to Andriy and Linus for their review.

3/ Testing the raid related corner cases of 1/ triggered bugs in the
   recently added 16-source operation support in the ioatdma driver.

4/ Some minor fixes / cleanups to mv_xor and ioatdma.

Conflicts:
	drivers/dma/dmatest.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

2 files changed, 2 insertions, 3 deletions

diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c
index 540516ca872c..879ea6fdd1be 100644
--- a/drivers/media/platform/m2m-deinterlace.c
+++ b/drivers/media/platform/m2m-deinterlace.c
@@ -341,8 +341,7 @@ static void deinterlace_issue_dma(struct deinterlace_ctx *ctx, int op,
         ctx->xt->dir = DMA_MEM_TO_MEM;
         ctx->xt->src_sgl = false;
         ctx->xt->dst_sgl = true;
-        flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT |
-                DMA_COMPL_SKIP_DEST_UNMAP | DMA_COMPL_SKIP_SRC_UNMAP;
+        flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT;
 
         tx = dmadev->device_prep_interleaved_dma(chan, ctx->xt, flags);
         if (tx == NULL) {
diff --git a/drivers/media/platform/timblogiw.c b/drivers/media/platform/timblogiw.c
index b557caf5b1a4..59a95e3ab0e3 100644
--- a/drivers/media/platform/timblogiw.c
+++ b/drivers/media/platform/timblogiw.c
@@ -565,7 +565,7 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
 
         desc = dmaengine_prep_slave_sg(fh->chan,
                 buf->sg, sg_elems, DMA_DEV_TO_MEM,
-                DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
+                DMA_PREP_INTERRUPT);
         if (!desc) {
                 spin_lock_irq(&fh->queue_lock);
                 list_del_init(&vb->queue);