dmaengine: provide helper for setting txstate

Simple conditional struct filler to cut out some duplicated code.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>

13 files changed, 17 insertions, 88 deletions

diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index ff75cf18d32e..93ed99c84cf1 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -834,12 +834,7 @@ atc_tx_status(struct dma_chan *chan,
 
         spin_unlock_bh(&atchan->lock);
 
-        if (txstate) {
-                txstate->last = last_complete;
-                txstate->used = last_used;
-                txstate->residue = 0;
-        }
-
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
         dev_vdbg(chan2dev(chan), "tx_status: %d (d%d, u%d)\n",
                  cookie, last_complete ? last_complete : 0,
                  last_used ? last_used : 0);
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index 309db3beef16..4233440741a2 100644
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
@@ -1147,12 +1147,8 @@ coh901318_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
 
         ret = dma_async_is_complete(cookie, last_complete, last_used);
 
-        if (txstate) {
-                txstate->last = last_complete;
-                txstate->used = last_used;
-                txstate->residue = coh901318_get_bytes_left(chan);
-        }
-
+        dma_set_tx_state(txstate, last_complete, last_used,
+                         coh901318_get_bytes_left(chan));
         if (ret == DMA_IN_PROGRESS && cohc->stopped)
                 ret = DMA_PAUSED;
 
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 263b70ee8562..18fb5b41cedf 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -841,11 +841,7 @@ dwc_tx_status(struct dma_chan *chan,
                 ret = dma_async_is_complete(cookie, last_complete, last_used);
         }
 
-        if (txstate) {
-                txstate->last = last_complete;
-                txstate->used = last_used;
-                txstate->residue = 0;
-        }
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
 
         return ret;
 }
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index ca5e8a3dce72..cb1924f46c9e 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -987,11 +987,7 @@ static enum dma_status fsl_tx_status(struct dma_chan *dchan,
         last_used = dchan->cookie;
         last_complete = chan->completed_cookie;
 
-        if (txstate) {
-                txstate->last = last_complete;
-                txstate->used = last_used;
-                txstate->residue = 0;
-        }
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
 
         return dma_async_is_complete(cookie, last_complete, last_used);
 }
diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h
index 23399672239e..26f48ef94c5c 100644
--- a/drivers/dma/ioat/dma.h
+++ b/drivers/dma/ioat/dma.h
@@ -158,11 +158,7 @@ ioat_tx_status(struct dma_chan *c, dma_cookie_t cookie,
         last_used = c->cookie;
         last_complete = chan->completed_cookie;
 
-        if (txstate) {
-                txstate->last = last_complete;
-                txstate->used = last_used;
-                txstate->residue = 0;
-        }
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
 
         return dma_async_is_complete(cookie, last_complete, last_used);
 }
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index ee40dbba1879..e5d4b97b7fd5 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -909,13 +909,7 @@ static enum dma_status iop_adma_status(struct dma_chan *chan,
 
         last_used = chan->cookie;
         last_complete = iop_chan->completed_cookie;
-
-        if (txstate) {
-                txstate->last = last_complete;
-                txstate->used = last_used;
-                txstate->residue = 0;
-        }
-
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
         ret = dma_async_is_complete(cookie, last_complete, last_used);
         if (ret == DMA_SUCCESS)
                 return ret;
@@ -924,12 +918,7 @@ static enum dma_status iop_adma_status(struct dma_chan *chan,
 
         last_used = chan->cookie;
         last_complete = iop_chan->completed_cookie;
-
-        if (txstate) {
-                txstate->last = last_complete;
-                txstate->used = last_used;
-                txstate->residue = 0;
-        }
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
 
         return dma_async_is_complete(cookie, last_complete, last_used);
 }
diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c
index b9cef8b1701c..246a6143e4a7 100644
--- a/drivers/dma/ipu/ipu_idmac.c
+++ b/drivers/dma/ipu/ipu_idmac.c
@@ -1651,11 +1651,7 @@ static enum dma_status idmac_tx_status(struct dma_chan *chan,
 {
         struct idmac_channel *ichan = to_idmac_chan(chan);
 
-        if (txstate) {
-                txstate->last = ichan->completed;
-                txstate->used = chan->cookie;
-                txstate->residue = 0;
-        }
+        dma_set_tx_state(txstate, ichan->completed, chan->cookie, 0);
         if (cookie != chan->cookie)
                 return DMA_ERROR;
         return DMA_SUCCESS;
diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c
index cb3a8e94ea48..7a750b95303c 100644
--- a/drivers/dma/mpc512x_dma.c
+++ b/drivers/dma/mpc512x_dma.c
@@ -553,12 +553,7 @@ mpc_dma_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
         last_complete = mchan->completed_cookie;
         spin_unlock_irqrestore(&mchan->lock, flags);
 
-        if (txstate) {
-                txstate->last = last_complete;
-                txstate->used = last_used;
-                txstate->residue = 0;
-        }
-
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
         return dma_async_is_complete(cookie, last_complete, last_used);
 }
 
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index 79fb1dea691b..4b8c1fcc834d 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -826,11 +826,7 @@ static enum dma_status mv_xor_status(struct dma_chan *chan,
         last_used = chan->cookie;
         last_complete = mv_chan->completed_cookie;
         mv_chan->is_complete_cookie = cookie;
-        if (txstate) {
-                txstate->last = last_complete;
-                txstate->used = last_used;
-                txstate->residue = 0;
-        }
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
 
         ret = dma_async_is_complete(cookie, last_complete, last_used);
         if (ret == DMA_SUCCESS) {
@@ -842,12 +838,7 @@ static enum dma_status mv_xor_status(struct dma_chan *chan,
         last_used = chan->cookie;
         last_complete = mv_chan->completed_cookie;
 
-        if (txstate) {
-                txstate->last = last_complete;
-                txstate->used = last_used;
-                txstate->residue = 0;
-        }
-
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
         return dma_async_is_complete(cookie, last_complete, last_used);
 }
 
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
index d9a54c018652..5558419876e8 100644
--- a/drivers/dma/ppc4xx/adma.c
+++ b/drivers/dma/ppc4xx/adma.c
@@ -3951,11 +3951,7 @@ static enum dma_status ppc440spe_adma_tx_status(struct dma_chan *chan,
         last_used = chan->cookie;
         last_complete = ppc440spe_chan->completed_cookie;
 
-        if (txstate) {
-                txstate->last = last_complete;
-                txstate->used = last_used;
-                txstate->residue = 0;
-        }
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
 
         ret = dma_async_is_complete(cookie, last_complete, last_used);
         if (ret == DMA_SUCCESS)
@@ -3966,11 +3962,7 @@ static enum dma_status ppc440spe_adma_tx_status(struct dma_chan *chan,
         last_used = chan->cookie;
         last_complete = ppc440spe_chan->completed_cookie;
 
-        if (txstate) {
-                txstate->last = last_complete;
-                txstate->used = last_used;
-                txstate->residue = 0;
-        }
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
 
         return dma_async_is_complete(cookie, last_complete, last_used);
 }
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index 8aeda9ceb225..98f82cdb404c 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -752,12 +752,7 @@ static enum dma_status sh_dmae_tx_status(struct dma_chan *chan,
         last_used = chan->cookie;
         last_complete = sh_chan->completed_cookie;
         BUG_ON(last_complete < 0);
-
-        if (txstate) {
-                txstate->last = last_complete;
-                txstate->used = last_used;
-                txstate->residue = 0;
-        }
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
 
         spin_lock_bh(&sh_chan->desc_lock);
 
diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index 8fc28814561a..e20d5c1fa213 100644
--- a/drivers/dma/timb_dma.c
+++ b/drivers/dma/timb_dma.c
@@ -527,11 +527,7 @@ static enum dma_status td_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
 
         ret = dma_async_is_complete(cookie, last_complete, last_used);
 
-        if (txstate) {
-                txstate->last = last_complete;
-                txstate->used = last_used;
-                txstate->residue = 0;
-        }
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
 
         dev_dbg(chan2dev(chan),
                 "%s: exit, ret: %d, last_complete: %d, last_used: %d\n",
diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c
index a44e422cbc27..e523737639aa 100644
--- a/drivers/dma/txx9dmac.c
+++ b/drivers/dma/txx9dmac.c
@@ -990,11 +990,7 @@ txx9dmac_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
                 ret = dma_async_is_complete(cookie, last_complete, last_used);
         }
 
-        if (txstate) {
-                txstate->last = last_complete;
-                txstate->used = last_used;
-                txstate->residue = 0;
-        }
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
 
         return ret;
 }