dmaengine: fsl-edma: refactor using devm_clk_get_enabled

Use devm_clk_get_enabled in probe code to reduce error checks,
thereby enhancing readability

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20230821161617.2142561-8-Frank.Li@nxp.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c
index c8b9f2eff11121803316cdff4a4fbddf7674a0fa..7dfbdc89051a879f8cacd9d86645a3fc5aa4bac5 100644 (file)
--- a/drivers/dma/fsl-edma-main.c
+++ b/drivers/dma/fsl-edma-main.c
@@ -276,17 +276,11 @@ static int fsl_edma_probe(struct platform_device *pdev)
        regs = &fsl_edma->regs;
 
        if (drvdata->flags & FSL_EDMA_DRV_HAS_DMACLK) {
-               fsl_edma->dmaclk = devm_clk_get(&pdev->dev, "dma");
+               fsl_edma->dmaclk = devm_clk_get_enabled(&pdev->dev, "dma");
                if (IS_ERR(fsl_edma->dmaclk)) {
                        dev_err(&pdev->dev, "Missing DMA block clock.\n");
                        return PTR_ERR(fsl_edma->dmaclk);
                }
-
-               ret = clk_prepare_enable(fsl_edma->dmaclk);
-               if (ret) {
-                       dev_err(&pdev->dev, "DMA clk block failed.\n");
-                       return ret;
-               }
        }
 
        for (i = 0; i < fsl_edma->drvdata->dmamuxs; i++) {
@@ -301,19 +295,12 @@ static int fsl_edma_probe(struct platform_device *pdev)
                }
 
                sprintf(clkname, "dmamux%d", i);
-               fsl_edma->muxclk[i] = devm_clk_get(&pdev->dev, clkname);
+               fsl_edma->muxclk[i] = devm_clk_get_enabled(&pdev->dev, clkname);
                if (IS_ERR(fsl_edma->muxclk[i])) {
                        dev_err(&pdev->dev, "Missing DMAMUX block clock.\n");
                        /* on error: disable all previously enabled clks */
-                       fsl_disable_clocks(fsl_edma, i);
                        return PTR_ERR(fsl_edma->muxclk[i]);
                }
-
-               ret = clk_prepare_enable(fsl_edma->muxclk[i]);
-               if (ret)
-                       /* on error: disable all previously enabled clks */
-                       fsl_disable_clocks(fsl_edma, i);
-
        }
 
        fsl_edma->big_endian = of_property_read_bool(np, "big-endian");
@@ -374,7 +361,6 @@ static int fsl_edma_probe(struct platform_device *pdev)
        if (ret) {
                dev_err(&pdev->dev,
                        "Can't register Freescale eDMA engine. (%d)\n", ret);
-               fsl_disable_clocks(fsl_edma, fsl_edma->drvdata->dmamuxs);
                return ret;
        }
 
@@ -383,7 +369,6 @@ static int fsl_edma_probe(struct platform_device *pdev)
                dev_err(&pdev->dev,
                        "Can't register Freescale eDMA of_dma. (%d)\n", ret);
                dma_async_device_unregister(&fsl_edma->dma_dev);
-               fsl_disable_clocks(fsl_edma, fsl_edma->drvdata->dmamuxs);
                return ret;
        }