Unverified Commit bbd0a66b authored by Li Zetao's avatar Li Zetao Committed by Mark Brown
Browse files

spi: orion: Use helper function devm_clk_get_enabled() 



Since commit 7ef9651e ("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: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarLi Zetao <lizetao1@huawei.com>
Link: https://lore.kernel.org/r/20230823133938.1359106-22-lizetao1@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 82c4fadb

drivers/spi/spi-orion.c

+2 −9
Original line number Diff line number Diff line
@@ -688,21 +688,17 @@ static int orion_spi_probe(struct platform_device *pdev) 
	devdata = devdata ? devdata : &orion_spi_dev_data;

	spi->devdata = devdata;



	spi->clk = devm_clk_get(&pdev->dev, NULL);

	spi->clk = devm_clk_get_enabled(&pdev->dev, NULL);

	if (IS_ERR(spi->clk)) {

		status = PTR_ERR(spi->clk);

		goto out;

	}



	status = clk_prepare_enable(spi->clk);

	if (status)

		goto out;



	/* The following clock is only used by some SoCs */

	spi->axi_clk = devm_clk_get(&pdev->dev, "axi");

	if (PTR_ERR(spi->axi_clk) == -EPROBE_DEFER) {

		status = -EPROBE_DEFER;

		goto out_rel_clk;

		goto out;

	}

	if (!IS_ERR(spi->axi_clk))

		clk_prepare_enable(spi->axi_clk);
@@ -795,8 +791,6 @@ static int orion_spi_probe(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);

out_rel_axi_clk:

	clk_disable_unprepare(spi->axi_clk);

out_rel_clk:

	clk_disable_unprepare(spi->clk);

out:

	spi_controller_put(host);

	return status;
@@ -810,7 +804,6 @@ static void orion_spi_remove(struct platform_device *pdev) 


	pm_runtime_get_sync(&pdev->dev);

	clk_disable_unprepare(spi->axi_clk);

	clk_disable_unprepare(spi->clk);



	spi_unregister_controller(host);

	pm_runtime_disable(&pdev->dev);