aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/ep93xx_dma.c
diff options
context:
space:
mode:
authorRussell King - ARM Linux <linux@arm.linux.org.uk>2012-03-06 17:35:27 -0500
committerVinod Koul <vinod.koul@linux.intel.com>2012-03-13 02:07:14 -0400
commit96a2af41c78b1fbb1f567a3486bdc63f7b31c5fd (patch)
treed977c6b2ff1a23dfd523e70315ebe976a3f3f079 /drivers/dma/ep93xx_dma.c
parentf7fbce07c6ce26a25b4e0cb5f241c361fde87901 (diff)
dmaengine: consolidate tx_status functions
Now that we have the completed cookie in the dma_chan structure, we can consolidate the tx_status functions by providing a function to set the txstate structure and returning the DMA status. We also provide a separate helper to set the residue for cookies which are still in progress. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Tested-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Jassi Brar <jassisinghbrar@gmail.com> [imx-sdma.c & mxs-dma.c] Tested-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma/ep93xx_dma.c')
-rw-r--r--drivers/dma/ep93xx_dma.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
index 1c56f75d9faf..142ebf0cd316 100644
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@ -1241,18 +1241,13 @@ static enum dma_status ep93xx_dma_tx_status(struct dma_chan *chan,
1241 struct dma_tx_state *state) 1241 struct dma_tx_state *state)
1242{ 1242{
1243 struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan); 1243 struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan);
1244 dma_cookie_t last_used, last_completed;
1245 enum dma_status ret; 1244 enum dma_status ret;
1246 unsigned long flags; 1245 unsigned long flags;
1247 1246
1248 spin_lock_irqsave(&edmac->lock, flags); 1247 spin_lock_irqsave(&edmac->lock, flags);
1249 last_used = chan->cookie; 1248 ret = dma_cookie_status(chan, cookie, state);
1250 last_completed = chan->completed_cookie;
1251 spin_unlock_irqrestore(&edmac->lock, flags); 1249 spin_unlock_irqrestore(&edmac->lock, flags);
1252 1250
1253 ret = dma_async_is_complete(cookie, last_completed, last_used);
1254 dma_set_tx_state(state, last_completed, last_used, 0);
1255
1256 return ret; 1251 return ret;
1257} 1252}
1258 1253