dmaengine: apple-admac: Do not use devres for IRQs

[ Upstream commit 072431595a57bc6605c29724afce5f9ef8114915 ]

This is in advance of adding support for triggering the reset signal to
the peripheral, since registering the IRQ handler will have to be
sequenced with it.

Signed-off-by: Martin Povišer <povik+lin@cutebit.org>
Link: https://lore.kernel.org/r/20220918095845.68860-4-povik+lin@cutebit.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Stable-dep-of: 568aa6dd641f ("dmaengine: apple-admac: Allocate cache SRAM to channels")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/dma/apple-admac.c b/drivers/dma/apple-admac.c
index 6780761a16403169583ee3d7d9defa61988f91ec..d69ed9c93648ecb42878fae2778f2a5d069d5606 100644 (file)
--- a/drivers/dma/apple-admac.c
+++ b/drivers/dma/apple-admac.c
@@ -96,6 +96,7 @@ struct admac_data {
        struct device *dev;
        __iomem void *base;
 
+       int irq;
        int irq_index;
        int nchannels;
        struct admac_chan channels[];
@@ -724,12 +725,7 @@ static int admac_probe(struct platform_device *pdev)
 
        if (irq < 0)
                return dev_err_probe(&pdev->dev, irq, "no usable interrupt\n");
-
-       err = devm_request_irq(&pdev->dev, irq, admac_interrupt,
-                              0, dev_name(&pdev->dev), ad);
-       if (err)
-               return dev_err_probe(&pdev->dev, err,
-                                    "unable to register interrupt\n");
+       ad->irq = irq;
 
        ad->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(ad->base))
@@ -774,17 +770,29 @@ static int admac_probe(struct platform_device *pdev)
                tasklet_setup(&adchan->tasklet, admac_chan_tasklet);
        }
 
-       err = dma_async_device_register(&ad->dma);
+       err = request_irq(irq, admac_interrupt, 0, dev_name(&pdev->dev), ad);
        if (err)
-               return dev_err_probe(&pdev->dev, err, "failed to register DMA device\n");
+               return dev_err_probe(&pdev->dev, err,
+                                    "unable to register interrupt\n");
+
+       err = dma_async_device_register(&ad->dma);
+       if (err) {
+               dev_err_probe(&pdev->dev, err, "failed to register DMA device\n");
+               goto free_irq;
+       }
 
        err = of_dma_controller_register(pdev->dev.of_node, admac_dma_of_xlate, ad);
        if (err) {
                dma_async_device_unregister(&ad->dma);
-               return dev_err_probe(&pdev->dev, err, "failed to register with OF\n");
+               dev_err_probe(&pdev->dev, err, "failed to register with OF\n");
+               goto free_irq;
        }
 
        return 0;
+
+free_irq:
+       free_irq(ad->irq, ad);
+       return err;
 }
 
 static int admac_remove(struct platform_device *pdev)
@@ -793,6 +801,7 @@ static int admac_remove(struct platform_device *pdev)
 
        of_dma_controller_free(pdev->dev.of_node);
        dma_async_device_unregister(&ad->dma);
+       free_irq(ad->irq, ad);
 
        return 0;
 }