Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[deliverable/linux.git] / drivers / dma / nbpfaxi.c

diff --git a/drivers/dma/nbpfaxi.c b/drivers/dma/nbpfaxi.c
index 2b5a198ac77e483fdf9a0e0479b200935cc4f501..08c45c18554966fb0cc1aa657ad18cd5d1be5e30 100644 (file)
--- a/drivers/dma/nbpfaxi.c
+++ b/drivers/dma/nbpfaxi.c
@@ -227,6 +227,7 @@ struct nbpf_device {
        void __iomem *base;
        struct clk *clk;
        const struct nbpf_config *config;
+       unsigned int eirq;
        struct nbpf_channel chan[];
 };
 
@@ -1300,10 +1301,9 @@ static int nbpf_probe(struct platform_device *pdev)
 
        nbpf = devm_kzalloc(dev, sizeof(*nbpf) + num_channels *
                            sizeof(nbpf->chan[0]), GFP_KERNEL);
-       if (!nbpf) {
-               dev_err(dev, "Memory allocation failed\n");
+       if (!nbpf)
                return -ENOMEM;
-       }
+
        dma_dev = &nbpf->dma_dev;
        dma_dev->dev = dev;
 
@@ -1376,6 +1376,7 @@ static int nbpf_probe(struct platform_device *pdev)
                               IRQF_SHARED, "dma error", nbpf);
        if (ret < 0)
                return ret;
+       nbpf->eirq = eirq;
 
        INIT_LIST_HEAD(&dma_dev->channels);
 
@@ -1447,6 +1448,17 @@ e_clk_off:
 static int nbpf_remove(struct platform_device *pdev)
 {
        struct nbpf_device *nbpf = platform_get_drvdata(pdev);
+       int i;
+
+       devm_free_irq(&pdev->dev, nbpf->eirq, nbpf);
+
+       for (i = 0; i < nbpf->config->num_channels; i++) {
+               struct nbpf_channel *chan = nbpf->chan + i;
+
+               devm_free_irq(&pdev->dev, chan->irq, chan);
+
+               tasklet_kill(&chan->tasklet);
+       }
 
        of_dma_controller_free(pdev->dev.of_node);
        dma_async_device_unregister(&nbpf->dma_dev);