Skip to content

Commit e2b9622

Browse files
Li Zetaobroonie
authored andcommitted
spi: lantiq-ssc: Use helper function devm_clk_get_enabled()
Since commit 7ef9651 ("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: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Li Zetao <lizetao1@huawei.com> Link: https://lore.kernel.org/r/20230823133938.1359106-15-lizetao1@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 4812bc3 commit e2b9622

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

drivers/spi/spi-lantiq-ssc.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -932,14 +932,11 @@ static int lantiq_ssc_probe(struct platform_device *pdev)
932932
if (err)
933933
goto err_host_put;
934934

935-
spi->spi_clk = devm_clk_get(dev, "gate");
935+
spi->spi_clk = devm_clk_get_enabled(dev, "gate");
936936
if (IS_ERR(spi->spi_clk)) {
937937
err = PTR_ERR(spi->spi_clk);
938938
goto err_host_put;
939939
}
940-
err = clk_prepare_enable(spi->spi_clk);
941-
if (err)
942-
goto err_host_put;
943940

944941
/*
945942
* Use the old clk_get_fpi() function on Lantiq platform, till it
@@ -952,7 +949,7 @@ static int lantiq_ssc_probe(struct platform_device *pdev)
952949
#endif
953950
if (IS_ERR(spi->fpi_clk)) {
954951
err = PTR_ERR(spi->fpi_clk);
955-
goto err_clk_disable;
952+
goto err_host_put;
956953
}
957954

958955
num_cs = 8;
@@ -1010,8 +1007,6 @@ static int lantiq_ssc_probe(struct platform_device *pdev)
10101007
destroy_workqueue(spi->wq);
10111008
err_clk_put:
10121009
clk_put(spi->fpi_clk);
1013-
err_clk_disable:
1014-
clk_disable_unprepare(spi->spi_clk);
10151010
err_host_put:
10161011
spi_controller_put(host);
10171012

@@ -1029,7 +1024,6 @@ static void lantiq_ssc_remove(struct platform_device *pdev)
10291024
hw_enter_config_mode(spi);
10301025

10311026
destroy_workqueue(spi->wq);
1032-
clk_disable_unprepare(spi->spi_clk);
10331027
clk_put(spi->fpi_clk);
10341028
}
10351029

0 commit comments

Comments
 (0)