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, 1 insertions, 10 deletions

diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index 96d0a4fe8dd9..50510ef7db72 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -879,23 +879,14 @@ static enum dma_status sh_dmae_tx_status(struct dma_chan *chan,
                                         struct dma_tx_state *txstate)
 {
         struct sh_dmae_chan *sh_chan = to_sh_chan(chan);
-        dma_cookie_t last_used;
-        dma_cookie_t last_complete;
         enum dma_status status;
         unsigned long flags;
 
         sh_dmae_chan_ld_cleanup(sh_chan, false);
 
-        /* First read completed cookie to avoid a skew */
-        last_complete = chan->completed_cookie;
-        rmb();
-        last_used = chan->cookie;
-        BUG_ON(last_complete < 0);
-        dma_set_tx_state(txstate, last_complete, last_used, 0);
-
         spin_lock_irqsave(&sh_chan->desc_lock, flags);
 
-        status = dma_async_is_complete(cookie, last_complete, last_used);
+        status = dma_cookie_status(chan, cookie, txstate);
 
         /*
          * If we don't find cookie on the queue, it has been aborted and we have