diff options
Diffstat (limited to 'drivers/dma/txx9dmac.c')
-rw-r--r-- | drivers/dma/txx9dmac.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c index db6d809d4d04..66f8fca1bd3c 100644 --- a/drivers/dma/txx9dmac.c +++ b/drivers/dma/txx9dmac.c | |||
@@ -281,21 +281,6 @@ static void txx9dmac_desc_put(struct txx9dmac_chan *dc, | |||
281 | } | 281 | } |
282 | } | 282 | } |
283 | 283 | ||
284 | /* Called with dc->lock held and bh disabled */ | ||
285 | static dma_cookie_t | ||
286 | txx9dmac_assign_cookie(struct txx9dmac_chan *dc, struct txx9dmac_desc *desc) | ||
287 | { | ||
288 | dma_cookie_t cookie = dc->chan.cookie; | ||
289 | |||
290 | if (++cookie < 0) | ||
291 | cookie = 1; | ||
292 | |||
293 | dc->chan.cookie = cookie; | ||
294 | desc->txd.cookie = cookie; | ||
295 | |||
296 | return cookie; | ||
297 | } | ||
298 | |||
299 | /*----------------------------------------------------------------------*/ | 284 | /*----------------------------------------------------------------------*/ |
300 | 285 | ||
301 | static void txx9dmac_dump_regs(struct txx9dmac_chan *dc) | 286 | static void txx9dmac_dump_regs(struct txx9dmac_chan *dc) |
@@ -740,7 +725,7 @@ static dma_cookie_t txx9dmac_tx_submit(struct dma_async_tx_descriptor *tx) | |||
740 | dma_cookie_t cookie; | 725 | dma_cookie_t cookie; |
741 | 726 | ||
742 | spin_lock_bh(&dc->lock); | 727 | spin_lock_bh(&dc->lock); |
743 | cookie = txx9dmac_assign_cookie(dc, desc); | 728 | cookie = dma_cookie_assign(tx); |
744 | 729 | ||
745 | dev_vdbg(chan2dev(tx->chan), "tx_submit: queued %u %p\n", | 730 | dev_vdbg(chan2dev(tx->chan), "tx_submit: queued %u %p\n", |
746 | desc->txd.cookie, desc); | 731 | desc->txd.cookie, desc); |