dmaengine: dw: platform: Switch to acpi_dma_controller_register()

BugLink: https://bugs.launchpad.net/bugs/1863019
[ Upstream commit e7b8514e4d68bec21fc6385fa0a66797ddc34ac9 ]

There is a possibility to have registered ACPI DMA controller
while it has been gone already.

To avoid the potential crash, move to non-managed
acpi_dma_controller_register().

Fixes: 42c91ee71d6d ("dw_dmac: add ACPI support")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20190820131546.75744-8-andriy.shevchenko@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c
index 46a519e07195c73846a7672f04fc19417b948301..b408c07662f594a0c5c9a809b402a0bcda90a912 100644 (file)
--- a/drivers/dma/dw/platform.c
+++ b/drivers/dma/dw/platform.c
@@ -87,13 +87,20 @@ static void dw_dma_acpi_controller_register(struct dw_dma *dw)
        dma_cap_set(DMA_SLAVE, info->dma_cap);
        info->filter_fn = dw_dma_acpi_filter;
 
-       ret = devm_acpi_dma_controller_register(dev, acpi_dma_simple_xlate,
-                                               info);
+       ret = acpi_dma_controller_register(dev, acpi_dma_simple_xlate, info);
        if (ret)
                dev_err(dev, "could not register acpi_dma_controller\n");
 }
+
+static void dw_dma_acpi_controller_free(struct dw_dma *dw)
+{
+       struct device *dev = dw->dma.dev;
+
+       acpi_dma_controller_free(dev);
+}
 #else /* !CONFIG_ACPI */
 static inline void dw_dma_acpi_controller_register(struct dw_dma *dw) {}
+static inline void dw_dma_acpi_controller_free(struct dw_dma *dw) {}
 #endif /* !CONFIG_ACPI */
 
 #ifdef CONFIG_OF
@@ -249,6 +256,9 @@ static int dw_remove(struct platform_device *pdev)
 {
        struct dw_dma_chip *chip = platform_get_drvdata(pdev);
 
+       if (ACPI_HANDLE(&pdev->dev))
+               dw_dma_acpi_controller_free(chip->dw);
+
        if (pdev->dev.of_node)
                of_dma_controller_free(pdev->dev.of_node);