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, 18 deletions

diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 346327572cfb..810f696eda4e 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -964,31 +964,17 @@ static enum dma_status pl08x_dma_tx_status(struct dma_chan *chan,
                 dma_cookie_t cookie, struct dma_tx_state *txstate)
 {
         struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
-        dma_cookie_t last_used;
-        dma_cookie_t last_complete;
         enum dma_status ret;
-        u32 bytesleft = 0;
 
-        last_used = plchan->chan.cookie;
-        last_complete = plchan->chan.completed_cookie;
-
-        ret = dma_async_is_complete(cookie, last_complete, last_used);
-        if (ret == DMA_SUCCESS) {
-                dma_set_tx_state(txstate, last_complete, last_used, 0);
+        ret = dma_cookie_status(chan, cookie, txstate);
+        if (ret == DMA_SUCCESS)
                 return ret;
-        }
 
         /*
          * This cookie not complete yet
+         * Get number of bytes left in the active transactions and queue
          */
-        last_used = plchan->chan.cookie;
-        last_complete = plchan->chan.completed_cookie;
-
-        /* Get number of bytes left in the active transactions and queue */
-        bytesleft = pl08x_getbytes_chan(plchan);
-
-        dma_set_tx_state(txstate, last_complete, last_used,
-                         bytesleft);
+        dma_set_residue(txstate, pl08x_getbytes_chan(plchan));
 
         if (plchan->state == PL08X_CHAN_PAUSED)
                 return DMA_PAUSED;