Merge tag 'nios2-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...

[karo-tx-linux.git] / drivers / dma / mpc512x_dma.c

diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c
index fa86592c7ae1d80b717a710a31a81f0f618b2acc..dde713461a95386b7648e3620672bf930157496e 100644 (file)
--- a/drivers/dma/mpc512x_dma.c
+++ b/drivers/dma/mpc512x_dma.c
@@ -411,8 +411,7 @@ static void mpc_dma_process_completed(struct mpc_dma *mdma)
                list_for_each_entry(mdesc, &list, node) {
                        desc = &mdesc->desc;
 
-                       if (desc->callback)
-                               desc->callback(desc->callback_param);
+                       dmaengine_desc_get_callback_invoke(desc, NULL);
 
                        last_cookie = desc->cookie;
                        dma_run_dependencies(desc);
@@ -926,7 +925,7 @@ static int mpc_dma_probe(struct platform_device *op)
        }
 
        mdma->irq = irq_of_parse_and_map(dn, 0);
-       if (mdma->irq == NO_IRQ) {
+       if (!mdma->irq) {
                dev_err(dev, "Error mapping IRQ!\n");
                retval = -EINVAL;
                goto err;
@@ -935,7 +934,7 @@ static int mpc_dma_probe(struct platform_device *op)
        if (of_device_is_compatible(dn, "fsl,mpc8308-dma")) {
                mdma->is_mpc8308 = 1;
                mdma->irq2 = irq_of_parse_and_map(dn, 1);
-               if (mdma->irq2 == NO_IRQ) {
+               if (!mdma->irq2) {
                        dev_err(dev, "Error mapping IRQ!\n");
                        retval = -EINVAL;
                        goto err_dispose1;