dmaengine: tegra-apb: Remove assumptions about unavailable runtime PM
authorDmitry Osipenko <digetx@gmail.com>
Sun, 9 Feb 2020 16:33:47 +0000 (19:33 +0300)
committerVinod Koul <vkoul@kernel.org>
Tue, 25 Feb 2020 06:27:33 +0000 (11:57 +0530)
The runtime PM is always available on all Tegra SoCs since the commit
40b2bb1b132a ("ARM: tegra: enforce PM requirement"), so there is no
need to handle the case of unavailable RPM in the code anymore.

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

index 49b2d3c..4d909a7 100644 (file)
@@ -1433,11 +1433,8 @@ static int tegra_dma_probe(struct platform_device *pdev)
        spin_lock_init(&tdma->global_lock);
 
        pm_runtime_enable(&pdev->dev);
-       if (!pm_runtime_enabled(&pdev->dev))
-               ret = tegra_dma_runtime_resume(&pdev->dev);
-       else
-               ret = pm_runtime_get_sync(&pdev->dev);
 
+       ret = pm_runtime_get_sync(&pdev->dev);
        if (ret < 0)
                goto err_pm_disable;
 
@@ -1550,8 +1547,6 @@ err_unregister_dma_dev:
 
 err_pm_disable:
        pm_runtime_disable(&pdev->dev);
-       if (!pm_runtime_status_suspended(&pdev->dev))
-               tegra_dma_runtime_suspend(&pdev->dev);
 
        return ret;
 }
@@ -1561,10 +1556,7 @@ static int tegra_dma_remove(struct platform_device *pdev)
        struct tegra_dma *tdma = platform_get_drvdata(pdev);
 
        dma_async_device_unregister(&tdma->dma_dev);
-
        pm_runtime_disable(&pdev->dev);
-       if (!pm_runtime_status_suspended(&pdev->dev))
-               tegra_dma_runtime_suspend(&pdev->dev);
 
        return 0;
 }