Re: [PATCH 05/11] dmaengine: imx-sdma: make use of devm_clk_get_prepared()
From: Frank Li <Frank.li@nxp.com>
Date: 2025-09-03 15:01:35
Also in:
dmaengine, imx, lkml
On Wed, Sep 03, 2025 at 03:06:13PM +0200, Marco Felsch wrote:
Make use of the devm_clk_get_prepared() to cleanup the error handling during probe() and to automatically unprepare the clock during remove. Signed-off-by: Marco Felsch <redacted>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
quoted hunk ↗ jump to hunk
--- drivers/dma/imx-sdma.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-)diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index b6e649fda71dbce12a2106c94887f90d0aaaf600..5a571d3f33158813e0c56484600a49b19a6a72e2 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c@@ -2270,26 +2270,18 @@ static int sdma_probe(struct platform_device *pdev) if (IS_ERR(sdma->regs)) return PTR_ERR(sdma->regs); - sdma->clk_ipg = devm_clk_get(dev, "ipg"); + sdma->clk_ipg = devm_clk_get_prepared(dev, "ipg"); if (IS_ERR(sdma->clk_ipg)) return PTR_ERR(sdma->clk_ipg); - sdma->clk_ahb = devm_clk_get(dev, "ahb"); + sdma->clk_ahb = devm_clk_get_prepared(dev, "ahb"); if (IS_ERR(sdma->clk_ahb)) return PTR_ERR(sdma->clk_ahb); - ret = clk_prepare(sdma->clk_ipg); - if (ret) - return ret; - - ret = clk_prepare(sdma->clk_ahb); - if (ret) - goto err_clk; - ret = devm_request_irq(dev, irq, sdma_int_handler, 0, dev_name(dev), sdma); if (ret) - goto err_irq; + return ret; sdma->irq = irq;@@ -2330,11 +2322,11 @@ static int sdma_probe(struct platform_device *pdev) ret = sdma_init(sdma); if (ret) - goto err_irq; + return ret; ret = sdma_event_remap(sdma); if (ret) - goto err_irq; + return ret; if (sdma->drvdata->script_addrs) sdma_add_scripts(sdma, sdma->drvdata->script_addrs);@@ -2363,7 +2355,7 @@ static int sdma_probe(struct platform_device *pdev) ret = dma_async_device_register(&sdma->dma_device); if (ret) { dev_err(dev, "unable to register\n"); - goto err_irq; + return ret; } ret = of_dma_controller_register(np, sdma_xlate, sdma);@@ -2399,10 +2391,7 @@ static int sdma_probe(struct platform_device *pdev) err_register: dma_async_device_unregister(&sdma->dma_device); -err_irq: - clk_unprepare(sdma->clk_ahb); -err_clk: - clk_unprepare(sdma->clk_ipg); + return ret; }@@ -2413,8 +2402,6 @@ static void sdma_remove(struct platform_device *pdev) devm_free_irq(&pdev->dev, sdma->irq, sdma); dma_async_device_unregister(&sdma->dma_device); - clk_unprepare(sdma->clk_ahb); - clk_unprepare(sdma->clk_ipg); /* Kill the tasklet */ for (i = 0; i < MAX_DMA_CHANNELS; i++) { struct sdma_channel *sdmac = &sdma->channel[i]; --2.47.2