async_tx: make async_tx_run_dependencies() easier to read

* Rename 'next' to 'dep'
* Move the channel switch check inside the loop to simplify
  termination

Acked-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2008-09-13 19:57:04 -07:00
parent 6bfb09a100
commit fdb0ac8061
1 changed files with 15 additions and 17 deletions

View File

@ -115,34 +115,32 @@ EXPORT_SYMBOL_GPL(dma_wait_for_async_tx);
* (start) dependent operations on their target channel * (start) dependent operations on their target channel
* @tx: transaction with dependencies * @tx: transaction with dependencies
*/ */
void void async_tx_run_dependencies(struct dma_async_tx_descriptor *tx)
async_tx_run_dependencies(struct dma_async_tx_descriptor *tx)
{ {
struct dma_async_tx_descriptor *next = tx->next; struct dma_async_tx_descriptor *dep = tx->next;
struct dma_async_tx_descriptor *dep_next;
struct dma_chan *chan; struct dma_chan *chan;
if (!next) if (!dep)
return; return;
tx->next = NULL; chan = dep->chan;
chan = next->chan;
/* keep submitting up until a channel switch is detected /* keep submitting up until a channel switch is detected
* in that case we will be called again as a result of * in that case we will be called again as a result of
* processing the interrupt from async_tx_channel_switch * processing the interrupt from async_tx_channel_switch
*/ */
while (next && next->chan == chan) { for (; dep; dep = dep_next) {
struct dma_async_tx_descriptor *_next; spin_lock_bh(&dep->lock);
dep->parent = NULL;
dep_next = dep->next;
if (dep_next && dep_next->chan == chan)
dep->next = NULL; /* ->next will be submitted */
else
dep_next = NULL; /* submit current dep and terminate */
spin_unlock_bh(&dep->lock);
spin_lock_bh(&next->lock); dep->tx_submit(dep);
next->parent = NULL;
_next = next->next;
if (_next && _next->chan == chan)
next->next = NULL;
spin_unlock_bh(&next->lock);
next->tx_submit(next);
next = _next;
} }
chan->device->device_issue_pending(chan); chan->device->device_issue_pending(chan);