dmaengine: tegra-apb: Use devm_request_irq

Use resource-managed variant of request_irq for brevity.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Acked-by: Jon Hunter <jonathanh@nvidia.com>
Link: https://lore.kernel.org/r/20200209163356.6439-8-digetx@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index 4468ded157809057c27913b2520784e9130936a3..9dc1fc2369412cad9116923e36153926aae6d3fc 100644 (file)
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -182,7 +182,6 @@ struct tegra_dma_channel {
        char                    name[12];
        bool                    config_init;
        int                     id;
-       int                     irq;
        void __iomem            *chan_addr;
        spinlock_t              lock;
        bool                    busy;
@@ -1384,7 +1383,6 @@ static const struct tegra_dma_chip_data tegra148_dma_chip_data = {
 
 static int tegra_dma_probe(struct platform_device *pdev)
 {
-       struct resource *res;
        struct tegra_dma *tdma;
        int ret;
        int i;
@@ -1450,25 +1448,27 @@ static int tegra_dma_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&tdma->dma_dev.channels);
        for (i = 0; i < cdata->nr_channels; i++) {
                struct tegra_dma_channel *tdc = &tdma->channels[i];
+               int irq;
 
                tdc->chan_addr = tdma->base_addr +
                                 TEGRA_APBDMA_CHANNEL_BASE_ADD_OFFSET +
                                 (i * cdata->channel_reg_size);
 
-               res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
-               if (!res) {
-                       ret = -EINVAL;
+               irq = platform_get_irq(pdev, i);
+               if (irq < 0) {
+                       ret = irq;
                        dev_err(&pdev->dev, "No irq resource for chan %d\n", i);
-                       goto err_irq;
+                       goto err_pm_disable;
                }
-               tdc->irq = res->start;
+
                snprintf(tdc->name, sizeof(tdc->name), "apbdma.%d", i);
-               ret = request_irq(tdc->irq, tegra_dma_isr, 0, tdc->name, tdc);
+               ret = devm_request_irq(&pdev->dev, irq, tegra_dma_isr, 0,
+                                      tdc->name, tdc);
                if (ret) {
                        dev_err(&pdev->dev,
                                "request_irq failed with err %d channel %d\n",
                                ret, i);
-                       goto err_irq;
+                       goto err_pm_disable;
                }
 
                tdc->dma_chan.device = &tdma->dma_dev;
@@ -1521,7 +1521,7 @@ static int tegra_dma_probe(struct platform_device *pdev)
        if (ret < 0) {
                dev_err(&pdev->dev,
                        "Tegra20 APB DMA driver registration failed %d\n", ret);
-               goto err_irq;
+               goto err_pm_disable;
        }
 
        ret = of_dma_controller_register(pdev->dev.of_node,
@@ -1538,13 +1538,7 @@ static int tegra_dma_probe(struct platform_device *pdev)
 
 err_unregister_dma_dev:
        dma_async_device_unregister(&tdma->dma_dev);
-err_irq:
-       while (--i >= 0) {
-               struct tegra_dma_channel *tdc = &tdma->channels[i];
-
-               free_irq(tdc->irq, tdc);
-       }
-
+err_pm_disable:
        pm_runtime_disable(&pdev->dev);
        if (!pm_runtime_status_suspended(&pdev->dev))
                tegra_dma_runtime_suspend(&pdev->dev);
@@ -1554,16 +1548,9 @@ err_irq:
 static int tegra_dma_remove(struct platform_device *pdev)
 {
        struct tegra_dma *tdma = platform_get_drvdata(pdev);
-       int i;
-       struct tegra_dma_channel *tdc;
 
        dma_async_device_unregister(&tdma->dma_dev);
 
-       for (i = 0; i < tdma->chip_data->nr_channels; ++i) {
-               tdc = &tdma->channels[i];
-               free_irq(tdc->irq, tdc);
-       }
-
        pm_runtime_disable(&pdev->dev);
        if (!pm_runtime_status_suspended(&pdev->dev))
                tegra_dma_runtime_suspend(&pdev->dev);