diff options
Diffstat (limited to 'drivers/dma/iop-adma.c')
-rw-r--r-- | drivers/dma/iop-adma.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index 650bf1e185e8..f2392d59568d 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c | |||
@@ -440,18 +440,6 @@ retry: | |||
440 | return NULL; | 440 | return NULL; |
441 | } | 441 | } |
442 | 442 | ||
443 | static dma_cookie_t | ||
444 | iop_desc_assign_cookie(struct iop_adma_chan *iop_chan, | ||
445 | struct iop_adma_desc_slot *desc) | ||
446 | { | ||
447 | dma_cookie_t cookie = iop_chan->common.cookie; | ||
448 | cookie++; | ||
449 | if (cookie < 0) | ||
450 | cookie = 1; | ||
451 | iop_chan->common.cookie = desc->async_tx.cookie = cookie; | ||
452 | return cookie; | ||
453 | } | ||
454 | |||
455 | static void iop_adma_check_threshold(struct iop_adma_chan *iop_chan) | 443 | static void iop_adma_check_threshold(struct iop_adma_chan *iop_chan) |
456 | { | 444 | { |
457 | dev_dbg(iop_chan->device->common.dev, "pending: %d\n", | 445 | dev_dbg(iop_chan->device->common.dev, "pending: %d\n", |
@@ -479,7 +467,7 @@ iop_adma_tx_submit(struct dma_async_tx_descriptor *tx) | |||
479 | slots_per_op = grp_start->slots_per_op; | 467 | slots_per_op = grp_start->slots_per_op; |
480 | 468 | ||
481 | spin_lock_bh(&iop_chan->lock); | 469 | spin_lock_bh(&iop_chan->lock); |
482 | cookie = iop_desc_assign_cookie(iop_chan, sw_desc); | 470 | cookie = dma_cookie_assign(tx); |
483 | 471 | ||
484 | old_chain_tail = list_entry(iop_chan->chain.prev, | 472 | old_chain_tail = list_entry(iop_chan->chain.prev, |
485 | struct iop_adma_desc_slot, chain_node); | 473 | struct iop_adma_desc_slot, chain_node); |