diff options
Diffstat (limited to 'drivers/dma/at_hdmac.c')
-rw-r--r-- | drivers/dma/at_hdmac.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index ce26ba381144..df47e7d6164b 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c | |||
@@ -193,27 +193,6 @@ static void atc_desc_chain(struct at_desc **first, struct at_desc **prev, | |||
193 | } | 193 | } |
194 | 194 | ||
195 | /** | 195 | /** |
196 | * atc_assign_cookie - compute and assign new cookie | ||
197 | * @atchan: channel we work on | ||
198 | * @desc: descriptor to assign cookie for | ||
199 | * | ||
200 | * Called with atchan->lock held and bh disabled | ||
201 | */ | ||
202 | static dma_cookie_t | ||
203 | atc_assign_cookie(struct at_dma_chan *atchan, struct at_desc *desc) | ||
204 | { | ||
205 | dma_cookie_t cookie = atchan->chan_common.cookie; | ||
206 | |||
207 | if (++cookie < 0) | ||
208 | cookie = 1; | ||
209 | |||
210 | atchan->chan_common.cookie = cookie; | ||
211 | desc->txd.cookie = cookie; | ||
212 | |||
213 | return cookie; | ||
214 | } | ||
215 | |||
216 | /** | ||
217 | * atc_dostart - starts the DMA engine for real | 196 | * atc_dostart - starts the DMA engine for real |
218 | * @atchan: the channel we want to start | 197 | * @atchan: the channel we want to start |
219 | * @first: first descriptor in the list we want to begin with | 198 | * @first: first descriptor in the list we want to begin with |
@@ -548,7 +527,7 @@ static dma_cookie_t atc_tx_submit(struct dma_async_tx_descriptor *tx) | |||
548 | unsigned long flags; | 527 | unsigned long flags; |
549 | 528 | ||
550 | spin_lock_irqsave(&atchan->lock, flags); | 529 | spin_lock_irqsave(&atchan->lock, flags); |
551 | cookie = atc_assign_cookie(atchan, desc); | 530 | cookie = dma_cookie_assign(tx); |
552 | 531 | ||
553 | if (list_empty(&atchan->active_list)) { | 532 | if (list_empty(&atchan->active_list)) { |
554 | dev_vdbg(chan2dev(tx->chan), "tx_submit: started %u\n", | 533 | dev_vdbg(chan2dev(tx->chan), "tx_submit: started %u\n", |