spi: spi-fsl-dspi: Use helper function devm_clk_get_enabled()

Since commit 7ef9651e9792 ("clk: Provide new devm_clk helpers for prepared
and enabled clocks"), devm_clk_get() and clk_prepare_enable() can now be
replaced by devm_clk_get_enabled() when driver enables (and possibly
prepares) the clocks for the whole lifetime of the device. Moreover, it is
no longer necessary to unprepare and disable the clocks explicitly.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Li Zetao <lizetao1@huawei.com>
Link: https://lore.kernel.org/r/20230823133938.1359106-14-lizetao1@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 8318249f8a1f9bedd38194dc0685954891305f49..c9eae046f66c9e746822e0275beb6b3715e89ff2 100644 (file)
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -1372,19 +1372,16 @@ static int dspi_probe(struct platform_device *pdev)
                }
        }
 
-       dspi->clk = devm_clk_get(&pdev->dev, "dspi");
+       dspi->clk = devm_clk_get_enabled(&pdev->dev, "dspi");
        if (IS_ERR(dspi->clk)) {
                ret = PTR_ERR(dspi->clk);
                dev_err(&pdev->dev, "unable to get clock\n");
                goto out_ctlr_put;
        }
-       ret = clk_prepare_enable(dspi->clk);
-       if (ret)
-               goto out_ctlr_put;
 
        ret = dspi_init(dspi);
        if (ret)
-               goto out_clk_put;
+               goto out_ctlr_put;
 
        dspi->irq = platform_get_irq(pdev, 0);
        if (dspi->irq <= 0) {
@@ -1400,7 +1397,7 @@ static int dspi_probe(struct platform_device *pdev)
                                   IRQF_SHARED, pdev->name, dspi);
        if (ret < 0) {
                dev_err(&pdev->dev, "Unable to attach DSPI interrupt\n");
-               goto out_clk_put;
+               goto out_ctlr_put;
        }
 
 poll_mode:
@@ -1432,8 +1429,6 @@ out_release_dma:
 out_free_irq:
        if (dspi->irq)
                free_irq(dspi->irq, dspi);
-out_clk_put:
-       clk_disable_unprepare(dspi->clk);
 out_ctlr_put:
        spi_controller_put(ctlr);
 
@@ -1458,7 +1453,6 @@ static void dspi_remove(struct platform_device *pdev)
        dspi_release_dma(dspi);
        if (dspi->irq)
                free_irq(dspi->irq, dspi);
-       clk_disable_unprepare(dspi->clk);
 }
 
 static void dspi_shutdown(struct platform_device *pdev)