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

spi: davinci: 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-11-lizetao1@huawei.com


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

drivers/spi/spi-davinci.c

+2 −9
Original line number Diff line number Diff line
@@ -915,14 +915,11 @@ static int davinci_spi_probe(struct platform_device *pdev) 


	dspi->bitbang.master = host;



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

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

	if (IS_ERR(dspi->clk)) {

		ret = -ENODEV;

		goto free_host;

	}

	ret = clk_prepare_enable(dspi->clk);

	if (ret)

		goto free_host;



	host->use_gpio_descriptors = true;

	host->dev.of_node = pdev->dev.of_node;
@@ -947,7 +944,7 @@ static int davinci_spi_probe(struct platform_device *pdev) 


	ret = davinci_spi_request_dma(dspi);

	if (ret == -EPROBE_DEFER) {

		goto free_clk;

		goto free_host;

	} else if (ret) {

		dev_info(&pdev->dev, "DMA is not supported (%d)\n", ret);

		dspi->dma_rx = NULL;
@@ -991,8 +988,6 @@ static int davinci_spi_probe(struct platform_device *pdev) 
		dma_release_channel(dspi->dma_rx);

		dma_release_channel(dspi->dma_tx);

	}

free_clk:

	clk_disable_unprepare(dspi->clk);

free_host:

	spi_controller_put(host);

err:
@@ -1018,8 +1013,6 @@ static void davinci_spi_remove(struct platform_device *pdev) 


	spi_bitbang_stop(&dspi->bitbang);



	clk_disable_unprepare(dspi->clk);



	if (dspi->dma_rx) {

		dma_release_channel(dspi->dma_rx);

		dma_release_channel(dspi->dma_tx);