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>

1 files changed, 6 insertions, 12 deletions

diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index b2826304da24..8a3297418cf0 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -996,26 +996,20 @@ atc_tx_status(struct dma_chan *chan,
 
         spin_lock_irqsave(&atchan->lock, flags);
 
-        last_complete = chan->completed_cookie;
-        last_used = chan->cookie;
-
-        ret = dma_async_is_complete(cookie, last_complete, last_used);
+        ret = dma_cookie_status(chan, cookie, txstate);
         if (ret != DMA_SUCCESS) {
                 atc_cleanup_descriptors(atchan);
 
-                last_complete = chan->completed_cookie;
-                last_used = chan->cookie;
-
-                ret = dma_async_is_complete(cookie, last_complete, last_used);
+                ret = dma_cookie_status(chan, cookie, txstate);
         }
 
+        last_complete = chan->completed_cookie;
+        last_used = chan->cookie;
+
         spin_unlock_irqrestore(&atchan->lock, flags);
 
         if (ret != DMA_SUCCESS)
-                dma_set_tx_state(txstate, last_complete, last_used,
-                        atc_first_active(atchan)->len);
-        else
-                dma_set_tx_state(txstate, last_complete, last_used, 0);
+                dma_set_residue(txstate, atc_first_active(atchan)->len);
 
         if (atc_chan_is_paused(atchan))
                 ret = DMA_PAUSED;