aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/pch_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/pch_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/pch_dma.c')
-rw-r--r--drivers/dma/pch_dma.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index 5218e48aed0..c30f63ee32c 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -565,19 +565,12 @@ static enum dma_status pd_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
565 struct dma_tx_state *txstate) 565 struct dma_tx_state *txstate)
566{ 566{
567 struct pch_dma_chan *pd_chan = to_pd_chan(chan); 567 struct pch_dma_chan *pd_chan = to_pd_chan(chan);
568 dma_cookie_t last_used; 568 enum dma_status ret;
569 dma_cookie_t last_completed;
570 int ret;
571 569
572 spin_lock_irq(&pd_chan->lock); 570 spin_lock_irq(&pd_chan->lock);
573 last_completed = chan->completed_cookie; 571 ret = dma_cookie_status(chan, cookie, txstate);
574 last_used = chan->cookie;
575 spin_unlock_irq(&pd_chan->lock); 572 spin_unlock_irq(&pd_chan->lock);
576 573
577 ret = dma_async_is_complete(cookie, last_completed, last_used);
578
579 dma_set_tx_state(txstate, last_completed, last_used, 0);
580
581 return ret; 574 return ret;
582} 575}
583 576