Merge remote-tracking branch 'iommu/next'

[deliverable/linux.git] / drivers / dma / sirf-dma.c

diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c
index d8bc3f2a71db1ad7dee743cd92999f970eb97832..8f62edad51bea3245e0dde2deeb692f09dc2c86c 100644 (file)
--- a/drivers/dma/sirf-dma.c
+++ b/drivers/dma/sirf-dma.c
@@ -360,9 +360,7 @@ static void sirfsoc_dma_process_completed(struct sirfsoc_dma *sdma)
                        list_for_each_entry(sdesc, &list, node) {
                                desc = &sdesc->desc;
 
-                               if (desc->callback)
-                                       desc->callback(desc->callback_param);
-
+                               dmaengine_desc_get_callback_invoke(desc, NULL);
                                last_cookie = desc->cookie;
                                dma_run_dependencies(desc);
                        }
@@ -388,8 +386,7 @@ static void sirfsoc_dma_process_completed(struct sirfsoc_dma *sdma)
 
                        desc = &sdesc->desc;
                        while (happened_cyclic != schan->completed_cyclic) {
-                               if (desc->callback)
-                                       desc->callback(desc->callback_param);
+                               dmaengine_desc_get_callback_invoke(desc, NULL);
                                schan->completed_cyclic++;
                        }
                }
@@ -869,7 +866,7 @@ static int sirfsoc_dma_probe(struct platform_device *op)
        }
 
        sdma->irq = irq_of_parse_and_map(dn, 0);
-       if (sdma->irq == NO_IRQ) {
+       if (!sdma->irq) {
                dev_err(dev, "Error mapping IRQ!\n");
                return -EINVAL;
        }