From: Huang Shijie <b32955@freescale.com>
Date: Tue, 31 Jan 2012 02:53:46 +0000 (+0800)
Subject: ENGR00173369-1 Revert "ENGR00169906-4 MXS-DMA : change the last parameter...
X-Git-Tag: v3.0.35-fsl_4.1.0~1755
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=23b8646f9c1ce2d9766a69490659ba4f5b7350ec;p=karo-tx-linux.git

ENGR00173369-1 Revert "ENGR00169906-4 MXS-DMA : change the last parameter...

This reverts commit a1a43335ccbf5578eb48edbf16c11e53d76c0123.

Signed-off-by: Huang Shijie <b32955@freescale.com>
---

diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index dda7525674b9..dfb0a6d0da8f 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -381,7 +381,7 @@ static void mxs_dma_free_chan_resources(struct dma_chan *chan)
 static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(
 		struct dma_chan *chan, struct scatterlist *sgl,
 		unsigned int sg_len, enum dma_data_direction direction,
-		unsigned long flags)
+		unsigned long append)
 {
 	struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);
 	struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
@@ -390,7 +390,6 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(
 	int i, j;
 	u32 *pio;
 	static int idx;
-	bool append = flags & MXS_DMA_F_APPEND;
 
 	if (mxs_chan->status == DMA_IN_PROGRESS && !append)
 		return NULL;
@@ -416,6 +415,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(
 		ccw->bits |= CCW_CHAIN;
 		ccw->bits &= ~CCW_IRQ;
 		ccw->bits &= ~CCW_DEC_SEM;
+		ccw->bits &= ~CCW_WAIT4END;
 	} else {
 		idx = 0;
 	}
@@ -430,8 +430,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(
 		ccw->bits = 0;
 		ccw->bits |= CCW_IRQ;
 		ccw->bits |= CCW_DEC_SEM;
-		if (flags & MXS_DMA_F_WAIT4END)
-			ccw->bits |= CCW_WAIT4END;
+		ccw->bits |= CCW_WAIT4END;
 		ccw->bits |= CCW_HALT_ON_TERM;
 		ccw->bits |= CCW_TERM_FLUSH;
 		ccw->bits |= BF_CCW(sg_len, PIO_NUM);
@@ -462,8 +461,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(
 				ccw->bits &= ~CCW_CHAIN;
 				ccw->bits |= CCW_IRQ;
 				ccw->bits |= CCW_DEC_SEM;
-				if (flags & MXS_DMA_F_WAIT4END)
-					ccw->bits |= CCW_WAIT4END;
+				ccw->bits |= CCW_WAIT4END;
 			}
 		}
 	}