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, 4 insertions, 15 deletions

diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 12ea60b2a1be..33bde5da850d 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -979,28 +979,17 @@ dwc_tx_status(struct dma_chan *chan,
               struct dma_tx_state *txstate)
 {
         struct dw_dma_chan      *dwc = to_dw_dma_chan(chan);
-        dma_cookie_t            last_used;
-        dma_cookie_t            last_complete;
-        int                     ret;
+        enum dma_status         ret;
 
-        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) {
                 dwc_scan_descriptors(to_dw_dma(chan->device), dwc);
 
-                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)
-                dma_set_tx_state(txstate, last_complete, last_used,
-                                dwc_first_active(dwc)->len);
-        else
-                dma_set_tx_state(txstate, last_complete, last_used, 0);
+                dma_set_residue(txstate, dwc_first_active(dwc)->len);
 
         if (dwc->paused)
                 return DMA_PAUSED;