Commit 91ea74e9 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Vinod Koul

DMA: shdma: tidyup callback chunk finder

Current shdma is using "last" which indicates last desc which needs to have
callback function. But that desc's chunks is always 1, we can use it as finder
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
[reflown changelog for readablity]
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 593d9c2e
...@@ -73,8 +73,7 @@ static void shdma_chan_xfer_ld_queue(struct shdma_chan *schan) ...@@ -73,8 +73,7 @@ static void shdma_chan_xfer_ld_queue(struct shdma_chan *schan)
static dma_cookie_t shdma_tx_submit(struct dma_async_tx_descriptor *tx) static dma_cookie_t shdma_tx_submit(struct dma_async_tx_descriptor *tx)
{ {
struct shdma_desc *chunk, *c, *desc = struct shdma_desc *chunk, *c, *desc =
container_of(tx, struct shdma_desc, async_tx), container_of(tx, struct shdma_desc, async_tx);
*last = desc;
struct shdma_chan *schan = to_shdma_chan(tx->chan); struct shdma_chan *schan = to_shdma_chan(tx->chan);
dma_async_tx_callback callback = tx->callback; dma_async_tx_callback callback = tx->callback;
dma_cookie_t cookie; dma_cookie_t cookie;
...@@ -98,19 +97,20 @@ static dma_cookie_t shdma_tx_submit(struct dma_async_tx_descriptor *tx) ...@@ -98,19 +97,20 @@ static dma_cookie_t shdma_tx_submit(struct dma_async_tx_descriptor *tx)
&chunk->node == &schan->ld_free)) &chunk->node == &schan->ld_free))
break; break;
chunk->mark = DESC_SUBMITTED; chunk->mark = DESC_SUBMITTED;
/* Callback goes to the last chunk */ if (chunk->chunks == 1) {
chunk->async_tx.callback = NULL; chunk->async_tx.callback = callback;
chunk->async_tx.callback_param = tx->callback_param;
} else {
/* Callback goes to the last chunk */
chunk->async_tx.callback = NULL;
}
chunk->cookie = cookie; chunk->cookie = cookie;
list_move_tail(&chunk->node, &schan->ld_queue); list_move_tail(&chunk->node, &schan->ld_queue);
last = chunk;
dev_dbg(schan->dev, "submit #%d@%p on %d\n", dev_dbg(schan->dev, "submit #%d@%p on %d\n",
tx->cookie, &last->async_tx, schan->id); tx->cookie, &chunk->async_tx, schan->id);
} }
last->async_tx.callback = callback;
last->async_tx.callback_param = tx->callback_param;
if (power_up) { if (power_up) {
int ret; int ret;
schan->pm_state = SHDMA_PM_BUSY; schan->pm_state = SHDMA_PM_BUSY;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment