Commit f918b3a6 authored by Li Zetao's avatar Li Zetao Committed by Mark Brown

spi: armada-3700: Use helper function devm_clk_get_prepared()

Since commit 7ef9651e ("clk: Provide new devm_clk helpers for prepared
and enabled clocks"), devm_clk_get() and clk_prepare() can now be replaced
by devm_clk_get_prepared() when driver prepares the clocks for the whole
lifetime of the device. Moreover, it is no longer necessary to unprepare
the clocks explicitly.
Signed-off-by: default avatarLi Zetao <lizetao1@huawei.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20230823133938.1359106-3-lizetao1@huawei.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1d3ea34b
...@@ -865,18 +865,12 @@ static int a3700_spi_probe(struct platform_device *pdev) ...@@ -865,18 +865,12 @@ static int a3700_spi_probe(struct platform_device *pdev)
init_completion(&spi->done); init_completion(&spi->done);
spi->clk = devm_clk_get(dev, NULL); spi->clk = devm_clk_get_prepared(dev, NULL);
if (IS_ERR(spi->clk)) { if (IS_ERR(spi->clk)) {
dev_err(dev, "could not find clk: %ld\n", PTR_ERR(spi->clk)); dev_err(dev, "could not find clk: %ld\n", PTR_ERR(spi->clk));
goto error; goto error;
} }
ret = clk_prepare(spi->clk);
if (ret) {
dev_err(dev, "could not prepare clk: %d\n", ret);
goto error;
}
host->max_speed_hz = min_t(unsigned long, A3700_SPI_MAX_SPEED_HZ, host->max_speed_hz = min_t(unsigned long, A3700_SPI_MAX_SPEED_HZ,
clk_get_rate(spi->clk)); clk_get_rate(spi->clk));
host->min_speed_hz = DIV_ROUND_UP(clk_get_rate(spi->clk), host->min_speed_hz = DIV_ROUND_UP(clk_get_rate(spi->clk),
...@@ -888,40 +882,29 @@ static int a3700_spi_probe(struct platform_device *pdev) ...@@ -888,40 +882,29 @@ static int a3700_spi_probe(struct platform_device *pdev)
dev_name(dev), host); dev_name(dev), host);
if (ret) { if (ret) {
dev_err(dev, "could not request IRQ: %d\n", ret); dev_err(dev, "could not request IRQ: %d\n", ret);
goto error_clk; goto error;
} }
ret = devm_spi_register_controller(dev, host); ret = devm_spi_register_controller(dev, host);
if (ret) { if (ret) {
dev_err(dev, "Failed to register host\n"); dev_err(dev, "Failed to register host\n");
goto error_clk; goto error;
} }
return 0; return 0;
error_clk:
clk_unprepare(spi->clk);
error: error:
spi_controller_put(host); spi_controller_put(host);
out: out:
return ret; return ret;
} }
static void a3700_spi_remove(struct platform_device *pdev)
{
struct spi_controller *host = platform_get_drvdata(pdev);
struct a3700_spi *spi = spi_controller_get_devdata(host);
clk_unprepare(spi->clk);
}
static struct platform_driver a3700_spi_driver = { static struct platform_driver a3700_spi_driver = {
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.of_match_table = of_match_ptr(a3700_spi_dt_ids), .of_match_table = of_match_ptr(a3700_spi_dt_ids),
}, },
.probe = a3700_spi_probe, .probe = a3700_spi_probe,
.remove_new = a3700_spi_remove,
}; };
module_platform_driver(a3700_spi_driver); module_platform_driver(a3700_spi_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment