dmaengine: move last completed cookie into generic dma_chan structure

Every DMA engine implementation declares a last completed dma cookie
in their private dma channel structures.  This is pointless, and
forces driver specific code.  Move this out into the common dma_chan
structure.

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>

4 files changed, 4 insertions, 6 deletions

diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
index a4d6cb0c0343..fab440af1f9a 100644
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
@@ -603,7 +603,7 @@ static void __cleanup(struct ioat_dma_chan *ioat, unsigned long phys_complete)
                  */
                 dump_desc_dbg(ioat, desc);
                 if (tx->cookie) {
-                        chan->completed_cookie = tx->cookie;
+                        chan->common.completed_cookie = tx->cookie;
                         tx->cookie = 0;
                         ioat_dma_unmap(chan, tx->flags, desc->len, desc->hw);
                         ioat->active -= desc->hw->tx_cnt;
diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h
index 5216c8a92a21..9653b6b6a715 100644
--- a/drivers/dma/ioat/dma.h
+++ b/drivers/dma/ioat/dma.h
@@ -90,7 +90,6 @@ struct ioat_chan_common {
         void __iomem *reg_base;
         unsigned long last_completion;
         spinlock_t cleanup_lock;
-        dma_cookie_t completed_cookie;
         unsigned long state;
         #define IOAT_COMPLETION_PENDING 0
         #define IOAT_COMPLETION_ACK 1
@@ -153,12 +152,11 @@ static inline enum dma_status
 ioat_tx_status(struct dma_chan *c, dma_cookie_t cookie,
                  struct dma_tx_state *txstate)
 {
-        struct ioat_chan_common *chan = to_chan_common(c);
         dma_cookie_t last_used;
         dma_cookie_t last_complete;
 
         last_used = c->cookie;
-        last_complete = chan->completed_cookie;
+        last_complete = c->completed_cookie;
 
         dma_set_tx_state(txstate, last_complete, last_used, 0);
 
diff --git a/drivers/dma/ioat/dma_v2.c b/drivers/dma/ioat/dma_v2.c
index 5d65f8377971..d3f0aff2c02a 100644
--- a/drivers/dma/ioat/dma_v2.c
+++ b/drivers/dma/ioat/dma_v2.c
@@ -147,7 +147,7 @@ static void __cleanup(struct ioat2_dma_chan *ioat, unsigned long phys_complete)
                 dump_desc_dbg(ioat, desc);
                 if (tx->cookie) {
                         ioat_dma_unmap(chan, tx->flags, desc->len, desc->hw);
-                        chan->completed_cookie = tx->cookie;
+                        chan->common.completed_cookie = tx->cookie;
                         tx->cookie = 0;
                         if (tx->callback) {
                                 tx->callback(tx->callback_param);
diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
index f519c93a61e7..d4afac741e8a 100644
--- a/drivers/dma/ioat/dma_v3.c
+++ b/drivers/dma/ioat/dma_v3.c
@@ -277,7 +277,7 @@ static void __cleanup(struct ioat2_dma_chan *ioat, unsigned long phys_complete)
                 dump_desc_dbg(ioat, desc);
                 tx = &desc->txd;
                 if (tx->cookie) {
-                        chan->completed_cookie = tx->cookie;
+                        chan->common.completed_cookie = tx->cookie;
                         ioat3_dma_unmap(ioat, desc, idx + i);
                         tx->cookie = 0;
                         if (tx->callback) {