Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[firefly-linux-kernel-4.4.55.git] / drivers / dma / sirf-dma.c

diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c
index 3eed8b35b0f19d51f025a5de2dc656b9fe3f211c..64385cde044b3feefcc49001edbf0e9ee647bd0d 100644 (file)
--- a/drivers/dma/sirf-dma.c
+++ b/drivers/dma/sirf-dma.c
@@ -570,21 +570,19 @@ static int __devinit sirfsoc_dma_probe(struct platform_device *op)
 
        if (of_property_read_u32(dn, "cell-index", &id)) {
                dev_err(dev, "Fail to get DMAC index\n");
-               ret = -ENODEV;
-               goto free_mem;
+               return -ENODEV;
        }
 
        sdma->irq = irq_of_parse_and_map(dn, 0);
        if (sdma->irq == NO_IRQ) {
                dev_err(dev, "Error mapping IRQ!\n");
-               ret = -EINVAL;
-               goto free_mem;
+               return -EINVAL;
        }
 
        ret = of_address_to_resource(dn, 0, &res);
        if (ret) {
                dev_err(dev, "Error parsing memory region!\n");
-               goto free_mem;
+               goto irq_dispose;
        }
 
        regs_start = res.start;
@@ -597,12 +595,11 @@ static int __devinit sirfsoc_dma_probe(struct platform_device *op)
                goto irq_dispose;
        }
 
-       ret = devm_request_irq(dev, sdma->irq, &sirfsoc_dma_irq, 0, DRV_NAME,
-               sdma);
+       ret = request_irq(sdma->irq, &sirfsoc_dma_irq, 0, DRV_NAME, sdma);
        if (ret) {
                dev_err(dev, "Error requesting IRQ!\n");
                ret = -EINVAL;
-               goto unmap_mem;
+               goto irq_dispose;
        }
 
        dma = &sdma->dma;
@@ -652,13 +649,9 @@ static int __devinit sirfsoc_dma_probe(struct platform_device *op)
        return 0;
 
 free_irq:
-       devm_free_irq(dev, sdma->irq, sdma);
+       free_irq(sdma->irq, sdma);
 irq_dispose:
        irq_dispose_mapping(sdma->irq);
-unmap_mem:
-       iounmap(sdma->base);
-free_mem:
-       devm_kfree(dev, sdma);
        return ret;
 }
 
@@ -668,10 +661,8 @@ static int __devexit sirfsoc_dma_remove(struct platform_device *op)
        struct sirfsoc_dma *sdma = dev_get_drvdata(dev);
 
        dma_async_device_unregister(&sdma->dma);
-       devm_free_irq(dev, sdma->irq, sdma);
+       free_irq(sdma->irq, sdma);
        irq_dispose_mapping(sdma->irq);
-       iounmap(sdma->base);
-       devm_kfree(dev, sdma);
        return 0;
 }