Skip to content

Commit

Permalink
dmaengine: provide helper for setting txstate
Browse files Browse the repository at this point in the history 
Simple conditional struct filler to cut out some duplicated code.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
Dan Williams committed Mar 26, 2010
1 parent 0793448 commit bca3469
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 88 deletions.
7 changes: 1 addition & 6 deletions drivers/dma/at_hdmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 2 additions & 6 deletions drivers/dma/coh901318.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 1 addition & 5 deletions drivers/dma/dw_dmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 1 addition & 5 deletions drivers/dma/fsldma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
6 changes: 1 addition & 5 deletions drivers/dma/ioat/dma.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
15 changes: 2 additions & 13 deletions drivers/dma/iop-adma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}
Expand Down
6 changes: 1 addition & 5 deletions drivers/dma/ipu/ipu_idmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 1 addition & 6 deletions drivers/dma/mpc512x_dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
13 changes: 2 additions & 11 deletions drivers/dma/mv_xor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
}

Expand Down
12 changes: 2 additions & 10 deletions drivers/dma/ppc4xx/adma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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);
}
Expand Down
7 changes: 1 addition & 6 deletions drivers/dma/shdma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 1 addition & 5 deletions drivers/dma/timb_dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 1 addition & 5 deletions drivers/dma/txx9dmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
10 changes: 10 additions & 0 deletions include/linux/dmaengine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,16 @@ static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie,
return DMA_IN_PROGRESS;
}

static inline void
dma_set_tx_state(struct dma_tx_state *st, dma_cookie_t last, dma_cookie_t used, u32 residue)
{
if (st) {
st->last = last;
st->used = used;
st->residue = residue;
}
}

enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie);
#ifdef CONFIG_DMA_ENGINE
enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx);
Expand Down

0 comments on commit bca3469

Please sign in to comment.