[PATCH 06/17] spi: npcm-pspi: Use helper function devm_clk_get_enabled()
From: Pei Xiao <hidden>
Date: 2026-03-12 09:29:28
Also in:
imx, linux-mediatek, linux-riscv, linux-rockchip, linux-spi, lkml, openbmc
Subsystem:
arm/nuvoton npcm architecture, spi subsystem, the rest · Maintainers:
Andrew Jeffery, Avi Fishman, Tomer Maimon, Tali Perry, Mark Brown, Linus Torvalds
devm_clk_get() and clk_prepare_enable() can now be replaced by devm_clk_get_enabled() when driver enables the clocks. Moreover, it is no longer necessary to unprepare and disable the clocks explicitly. Simplify code. Signed-off-by: Pei Xiao <redacted> --- drivers/spi/spi-npcm-pspi.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/drivers/spi/spi-npcm-pspi.c b/drivers/spi/spi-npcm-pspi.c
index e60b3cc398ec..99fa866f4efc 100644
--- a/drivers/spi/spi-npcm-pspi.c
+++ b/drivers/spi/spi-npcm-pspi.c@@ -361,27 +361,23 @@ static int npcm_pspi_probe(struct platform_device *pdev) goto out_host_put; } - priv->clk = devm_clk_get(&pdev->dev, NULL); + priv->clk = devm_clk_get_enabled(&pdev->dev, NULL); if (IS_ERR(priv->clk)) { - dev_err(&pdev->dev, "failed to get clock\n"); + dev_err(&pdev->dev, "failed to enable clock\n"); ret = PTR_ERR(priv->clk); goto out_host_put; } - ret = clk_prepare_enable(priv->clk); - if (ret) - goto out_host_put; - irq = platform_get_irq(pdev, 0); if (irq < 0) { ret = irq; - goto out_disable_clk; + goto out_host_put; } priv->reset = devm_reset_control_get(&pdev->dev, NULL); if (IS_ERR(priv->reset)) { ret = PTR_ERR(priv->reset); - goto out_disable_clk; + goto out_host_put; } /* reset SPI-HW block */
@@ -391,7 +387,7 @@ static int npcm_pspi_probe(struct platform_device *pdev) "npcm-pspi", priv); if (ret) { dev_err(&pdev->dev, "failed to request IRQ\n"); - goto out_disable_clk; + goto out_host_put; } init_completion(&priv->xfer_done);
@@ -415,15 +411,12 @@ static int npcm_pspi_probe(struct platform_device *pdev) ret = devm_spi_register_controller(&pdev->dev, host); if (ret) - goto out_disable_clk; + goto out_host_put; pr_info("NPCM Peripheral SPI %d probed\n", host->bus_num); return 0; -out_disable_clk: - clk_disable_unprepare(priv->clk); - out_host_put: spi_controller_put(host); return ret;
--
2.25.1