[PATCH 07/17] spi: orion: Use helper function devm_clk_get_enabled()

Pei Xiao
2026-03-12T23:07:16Z

drivers/spi/spi-orion.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index 7a2186b51b4c..69e41421dc88 100644
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -695,13 +695,11 @@ static int orion_spi_probe(struct platform_device *pdev)
}

/* The following clock is only used by some SoCs */
- spi->axi_clk = devm_clk_get(&pdev->dev, "axi");
+ spi->axi_clk = devm_clk_get_enabled(&pdev->dev, "axi");
if (PTR_ERR(spi->axi_clk) == -EPROBE_DEFER) {
status = -EPROBE_DEFER;
goto out;
}
- if (!IS_ERR(spi->axi_clk))
- clk_prepare_enable(spi->axi_clk);

tclk_hz = clk_get_rate(spi->clk);

@@ -726,7 +724,7 @@ static int orion_spi_probe(struct platform_device *pdev)
spi->base = devm_platform_get_and_ioremap_resource(pdev, 0, &r);
if (IS_ERR(spi->base)) {
status = PTR_ERR(spi->base);
- goto out_rel_axi_clk;
+ goto out;
}

for_each_available_child_of_node(pdev->dev.of_node, np) {
@@ -764,7 +762,7 @@ static int orion_spi_probe(struct platform_device *pdev)
if (!dir_acc->vaddr) {
status = -ENOMEM;
of_node_put(np);
- goto out_rel_axi_clk;
+ goto out;
}
dir_acc->size = PAGE_SIZE;

@@ -788,8 +786,6 @@ static int orion_spi_probe(struct platform_device *pdev)

out_rel_pm:
pm_runtime_disable(&pdev->dev);
-out_rel_axi_clk:
- clk_disable_unprepare(spi->axi_clk);
out:
spi_controller_put(host);
return status;
--
2.25.1