| .. | .. |
|---|
| 636 | 636 | |
|---|
| 637 | 637 | vchan_get_all_descriptors(&chan->vc, &head); |
|---|
| 638 | 638 | |
|---|
| 639 | | - /* |
|---|
| 640 | | - * As vchan_dma_desc_free_list can access to desc_allocated list |
|---|
| 641 | | - * we need to call it in vc.lock context. |
|---|
| 642 | | - */ |
|---|
| 643 | | - vchan_dma_desc_free_list(&chan->vc, &head); |
|---|
| 644 | | - |
|---|
| 645 | 639 | spin_unlock_irqrestore(&chan->vc.lock, flags); |
|---|
| 640 | + |
|---|
| 641 | + vchan_dma_desc_free_list(&chan->vc, &head); |
|---|
| 646 | 642 | |
|---|
| 647 | 643 | dev_vdbg(dchan2dev(dchan), "terminated: %s\n", axi_chan_name(chan)); |
|---|
| 648 | 644 | |
|---|
| .. | .. |
|---|
| 935 | 931 | |
|---|
| 936 | 932 | pm_runtime_put(chip->dev); |
|---|
| 937 | 933 | |
|---|
| 938 | | - ret = dma_async_device_register(&dw->dma); |
|---|
| 934 | + ret = dmaenginem_async_device_register(&dw->dma); |
|---|
| 939 | 935 | if (ret) |
|---|
| 940 | 936 | goto err_pm_disable; |
|---|
| 941 | 937 | |
|---|
| .. | .. |
|---|
| 977 | 973 | list_del(&chan->vc.chan.device_node); |
|---|
| 978 | 974 | tasklet_kill(&chan->vc.task); |
|---|
| 979 | 975 | } |
|---|
| 980 | | - |
|---|
| 981 | | - dma_async_device_unregister(&dw->dma); |
|---|
| 982 | 976 | |
|---|
| 983 | 977 | return 0; |
|---|
| 984 | 978 | } |
|---|