Merge branch 'rmk_cookie_fixes2' into next

Conflicts:
	drivers/dma/imx-dma.c
	drivers/dma/pl330.c

Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>

1 files changed, 11 insertions, 37 deletions

diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index f4aed5fc2cb6..5d225ddc7698 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -27,6 +27,7 @@
 #include <linux/of_device.h>
 
 #include "at_hdmac_regs.h"
+#include "dmaengine.h"
 
 /*
  * Glossary
@@ -192,27 +193,6 @@ static void atc_desc_chain(struct at_desc **first, struct at_desc **prev,
 }
 
 /**
- * atc_assign_cookie - compute and assign new cookie
- * @atchan: channel we work on
- * @desc: descriptor to assign cookie for
- *
- * Called with atchan->lock held and bh disabled
- */
-static dma_cookie_t
-atc_assign_cookie(struct at_dma_chan *atchan, struct at_desc *desc)
-{
-        dma_cookie_t cookie = atchan->chan_common.cookie;
-
-        if (++cookie < 0)
-                cookie = 1;
-
-        atchan->chan_common.cookie = cookie;
-        desc->txd.cookie = cookie;
-
-        return cookie;
-}
-
-/**
  * atc_dostart - starts the DMA engine for real
  * @atchan: the channel we want to start
  * @first: first descriptor in the list we want to begin with
@@ -269,7 +249,7 @@ atc_chain_complete(struct at_dma_chan *atchan, struct at_desc *desc)
         dev_vdbg(chan2dev(&atchan->chan_common),
                 "descriptor %u complete\n", txd->cookie);
 
-        atchan->completed_cookie = txd->cookie;
+        dma_cookie_complete(txd);
 
         /* move children to free_list */
         list_splice_init(&desc->tx_list, &atchan->free_list);
@@ -547,7 +527,7 @@ static dma_cookie_t atc_tx_submit(struct dma_async_tx_descriptor *tx)
         unsigned long           flags;
 
         spin_lock_irqsave(&atchan->lock, flags);
-        cookie = atc_assign_cookie(atchan, desc);
+        cookie = dma_cookie_assign(tx);
 
         if (list_empty(&atchan->active_list)) {
                 dev_vdbg(chan2dev(tx->chan), "tx_submit: started %u\n",
@@ -1016,26 +996,20 @@ atc_tx_status(struct dma_chan *chan,
 
         spin_lock_irqsave(&atchan->lock, flags);
 
-        last_complete = atchan->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 = atchan->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;
@@ -1129,7 +1103,7 @@ static int atc_alloc_chan_resources(struct dma_chan *chan)
         spin_lock_irqsave(&atchan->lock, flags);
         atchan->descs_allocated = i;
         list_splice(&tmp_list, &atchan->free_list);
-        atchan->completed_cookie = chan->cookie = 1;
+        dma_cookie_init(chan);
         spin_unlock_irqrestore(&atchan->lock, flags);
 
         /* channel parameters */
@@ -1329,7 +1303,7 @@ static int __init at_dma_probe(struct platform_device *pdev)
                 struct at_dma_chan      *atchan = &atdma->chan[i];
 
                 atchan->chan_common.device = &atdma->dma_common;
-                atchan->chan_common.cookie = atchan->completed_cookie = 1;
+                dma_cookie_init(&atchan->chan_common);
                 list_add_tail(&atchan->chan_common.device_node,
                                 &atdma->dma_common.channels);