dmaengine: imx-sdma: Remove platform data support
Subsystems (2)
Fabio Estevam
reviewerPATCH 1/2 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 <[email protected]>
--- drivers/dma/imx-sdma.c | 35 +++++++--------------- include/linux/platform_data/dma-imx-sdma.h | 11 ------- 2 files changed, 10 insertions(+), 36 deletions(-)
drivers/dma/imx-sdma.c +10 -25
@@ -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 ;
include/linux/platform_data/dma-imx-sdma.h +0 -11
@@ -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__ */
Signature · 1 line
2.17.1
Fabio Estevam
reviewerPATCH 2/2 dmaengine: imx-sdma: Use of_device_get_match_data()
Use of_device_get_match_data() to make the code simpler.
Signed-off-by Fabio Estevam <[email protected]>
--- drivers/dma/imx-sdma.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/dma/imx-sdma.c +1 -10
@@ -1952,8 +1952,6 @@ static struct dma_chan *sdma_xlate(struct of_phandle_args *dma_spec,static int sdma_probe (struct platform_device *pdev) { -const struct of_device_id *of_id = -of_match_device (sdma_dt_ids, &pdev->dev);struct device_node *np = pdev->dev.of_node;struct device_node *spba_bus;const char *fw_name;
@@ -1964,13 +1962,6 @@ static int sdma_probe(struct platform_device *pdev)int i;struct sdma_engine *sdma;s32 *saddr_arr; -const struct sdma_driver_data *drvdata =NULL ; - - drvdata = of_id->data; -if (!drvdata) { -dev_err (&pdev->dev,"unable to find driver data\n" ); -return -EINVAL ; - } ret =dma_coerce_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 ));if (ret)
@@ -1983,7 +1974,7 @@ static int sdma_probe(struct platform_device *pdev)spin_lock_init (&sdma->channel_0_lock); sdma->dev = &pdev->dev; - sdma->drvdata = drvdata; + sdma->drvdata =of_device_get_match_data (sdma->dev); irq =platform_get_irq (pdev,0 );if (irq <0 )
Signature · 1 line
2.17.1
Quoted 6 lines · Fabio Estevam
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.
Applied both, thanks
Signature · 1 line
~Vinod