aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/iop-adma.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2010-03-26 19:52:10 -0400
committerDan Williams <dan.j.williams@intel.com>2010-03-26 19:52:10 -0400
commitbca3469205402d9fb14060d255d8786ae2256640 (patch)
tree3b0c7f246fb9a6eafd3a82dd621dd9753589b3f4 /drivers/dma/iop-adma.c
parent0793448187643b50af89d36b08470baf45a3cab4 (diff)
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>
Diffstat (limited to 'drivers/dma/iop-adma.c')
-rw-r--r--drivers/dma/iop-adma.c15
1 files changed, 2 insertions, 13 deletions
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,
909 909
910 last_used = chan->cookie; 910 last_used = chan->cookie;
911 last_complete = iop_chan->completed_cookie; 911 last_complete = iop_chan->completed_cookie;
912 912 dma_set_tx_state(txstate, last_complete, last_used, 0);
913 if (txstate) {
914 txstate->last = last_complete;
915 txstate->used = last_used;
916 txstate->residue = 0;
917 }
918
919 ret = dma_async_is_complete(cookie, last_complete, last_used); 913 ret = dma_async_is_complete(cookie, last_complete, last_used);
920 if (ret == DMA_SUCCESS) 914 if (ret == DMA_SUCCESS)
921 return ret; 915 return ret;
@@ -924,12 +918,7 @@ static enum dma_status iop_adma_status(struct dma_chan *chan,
924 918
925 last_used = chan->cookie; 919 last_used = chan->cookie;
926 last_complete = iop_chan->completed_cookie; 920 last_complete = iop_chan->completed_cookie;
927 921 dma_set_tx_state(txstate, last_complete, last_used, 0);
928 if (txstate) {
929 txstate->last = last_complete;
930 txstate->used = last_used;
931 txstate->residue = 0;
932 }
933 922
934 return dma_async_is_complete(cookie, last_complete, last_used); 923 return dma_async_is_complete(cookie, last_complete, last_used);
935} 924}