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

spi: ath79: 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-5-lizetao1@huawei.com


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

drivers/spi/spi-ath79.c

+2 −9
Original line number Diff line number Diff line
@@ -200,20 +200,16 @@ static int ath79_spi_probe(struct platform_device *pdev) 
		goto err_put_host;

	}



	sp->clk = devm_clk_get(&pdev->dev, "ahb");

	sp->clk = devm_clk_get_enabled(&pdev->dev, "ahb");

	if (IS_ERR(sp->clk)) {

		ret = PTR_ERR(sp->clk);

		goto err_put_host;

	}



	ret = clk_prepare_enable(sp->clk);

	if (ret)

		goto err_put_host;



	rate = DIV_ROUND_UP(clk_get_rate(sp->clk), MHZ);

	if (!rate) {

		ret = -EINVAL;

		goto err_clk_disable;

		goto err_put_host;

	}



	sp->rrw_delay = ATH79_SPI_RRW_DELAY_FACTOR / rate;
@@ -229,8 +225,6 @@ static int ath79_spi_probe(struct platform_device *pdev) 


err_disable:

	ath79_spi_disable(sp);

err_clk_disable:

	clk_disable_unprepare(sp->clk);

err_put_host:

	spi_controller_put(host);
@@ -243,7 +237,6 @@ static void ath79_spi_remove(struct platform_device *pdev) 


	spi_bitbang_stop(&sp->bitbang);

	ath79_spi_disable(sp);

	clk_disable_unprepare(sp->clk);

	spi_controller_put(sp->bitbang.master);

}