spi: microchip-core: 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-19-lizetao1@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-microchip-core.c b/drivers/spi/spi-microchip-core.c
index b451cd4860ecbad73852c054b8be9c65255333fa..becdcdc9e6d1f30f55bdbb974921774ee2c96e59 100644 (file)
--- a/drivers/spi/spi-microchip-core.c
+++ b/drivers/spi/spi-microchip-core.c
@@ -539,22 +539,16 @@ static int mchp_corespi_probe(struct platform_device *pdev)
                return dev_err_probe(&pdev->dev, ret,
                                     "could not request irq\n");
 
-       spi->clk = devm_clk_get(&pdev->dev, NULL);
+       spi->clk = devm_clk_get_enabled(&pdev->dev, NULL);
        if (IS_ERR(spi->clk))
                return dev_err_probe(&pdev->dev, PTR_ERR(spi->clk),
                                     "could not get clk\n");
 
-       ret = clk_prepare_enable(spi->clk);
-       if (ret)
-               return dev_err_probe(&pdev->dev, ret,
-                                    "failed to enable clock\n");
-
        mchp_corespi_init(master, spi);
 
        ret = devm_spi_register_master(&pdev->dev, master);
        if (ret) {
                mchp_corespi_disable(spi);
-               clk_disable_unprepare(spi->clk);
                return dev_err_probe(&pdev->dev, ret,
                                     "unable to register master for SPI controller\n");
        }
@@ -570,7 +564,6 @@ static void mchp_corespi_remove(struct platform_device *pdev)
        struct mchp_corespi *spi = spi_master_get_devdata(master);
 
        mchp_corespi_disable_ints(spi);
-       clk_disable_unprepare(spi->clk);
        mchp_corespi_disable(spi);
 }