dmaengine: imx-sdma: Remove platform data support

Since 5.10-rc1, i.MX has been converted to a devicetree-only platform.

The platform data support in this driver was only used for non-DT
platforms.

Remove the platform data support as it has no more users.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Link: https://lore.kernel.org/r/20210118121549.1625217-1-festevam@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 41ba21eea7c8b2fee9125f27fa47b2fab7cc5cc7..a68950f80635c03583114d9bfbba06ec9059a8fe 100644 (file)
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1961,7 +1961,6 @@ static int sdma_probe(struct platform_device *pdev)
        int irq;
        struct resource *iores;
        struct resource spba_res;
-       struct sdma_platform_data *pdata = dev_get_platdata(&pdev->dev);
        int i;
        struct sdma_engine *sdma;
        s32 *saddr_arr;
@@ -2063,8 +2062,6 @@ static int sdma_probe(struct platform_device *pdev)
 
        if (sdma->drvdata->script_addrs)
                sdma_add_scripts(sdma, sdma->drvdata->script_addrs);
-       if (pdata && pdata->script_addrs)
-               sdma_add_scripts(sdma, pdata->script_addrs);
 
        sdma->dma_device.dev = &pdev->dev;
 
@@ -2110,30 +2107,18 @@ static int sdma_probe(struct platform_device *pdev)
        }
 
        /*
-        * Kick off firmware loading as the very last step:
-        * attempt to load firmware only if we're not on the error path, because
-        * the firmware callback requires a fully functional and allocated sdma
-        * instance.
+        * Because that device tree does not encode ROM script address,
+        * the RAM script in firmware is mandatory for device tree
+        * probe, otherwise it fails.
         */
-       if (pdata) {
-               ret = sdma_get_firmware(sdma, pdata->fw_name);
-               if (ret)
-                       dev_warn(&pdev->dev, "failed to get firmware from platform data\n");
+       ret = of_property_read_string(np, "fsl,sdma-ram-script-name",
+                                     &fw_name);
+       if (ret) {
+               dev_warn(&pdev->dev, "failed to get firmware name\n");
        } else {
-               /*
-                * Because that device tree does not encode ROM script address,
-                * the RAM script in firmware is mandatory for device tree
-                * probe, otherwise it fails.
-                */
-               ret = of_property_read_string(np, "fsl,sdma-ram-script-name",
-                                             &fw_name);
-               if (ret) {
-                       dev_warn(&pdev->dev, "failed to get firmware name\n");
-               } else {
-                       ret = sdma_get_firmware(sdma, fw_name);
-                       if (ret)
-                               dev_warn(&pdev->dev, "failed to get firmware from device tree\n");
-               }
+               ret = sdma_get_firmware(sdma, fw_name);
+               if (ret)
+                       dev_warn(&pdev->dev, "failed to get firmware from device tree\n");
        }
 
        return 0;

diff --git a/include/linux/platform_data/dma-imx-sdma.h b/include/linux/platform_data/dma-imx-sdma.h
index 30e676b36b247a595c39e98d7c59bdaa7e6eb233..725602d9df918158bb272d6ea813ace2c335e8fa 100644 (file)
--- a/include/linux/platform_data/dma-imx-sdma.h
+++ b/include/linux/platform_data/dma-imx-sdma.h
@@ -57,15 +57,4 @@ struct sdma_script_start_addrs {
        /* End of v4 array */
 };
 
-/**
- * struct sdma_platform_data - platform specific data for SDMA engine
- *
- * @fw_name            The firmware name
- * @script_addrs       SDMA scripts addresses in SDMA ROM
- */
-struct sdma_platform_data {
-       char *fw_name;
-       struct sdma_script_start_addrs *script_addrs;
-};
-
 #endif /* __MACH_MXC_SDMA_H__ */