niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

spi: use devm_clk_get_enabled() in mcfqspi_probe()

Browse source 
in mcfqspi_probe(), the return value of function
clk_prepare_enable() should be checked, since it may fail.
using devm_clk_get_enabled() instead of devm_clk_get() and
clk_prepare_enable() can avoid this problem.

Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com>
Link: https://lore.kernel.org/r/20230720140909.34084-1-ruc_gongyuanjun@163.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Yuanjun Gong 2023-07-20 22:09:09 +08:00 • committed by Mark Brown
parent 1e7dae6851
commit a90a987ebe
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/spi/spi-coldfire-qspi.c
View file

@ -381,13 +381,12 @@ static int mcfqspi_probe(struct platform_device *pdev)
goto fail0; goto fail0;
} }
mcfqspi->clk = devm_clk_get(&pdev->dev, "qspi_clk"); mcfqspi->clk = devm_clk_get_enabled(&pdev->dev, "qspi_clk");
if (IS_ERR(mcfqspi->clk)) { if (IS_ERR(mcfqspi->clk)) {
dev_dbg(&pdev->dev, "clk_get failed\n"); dev_dbg(&pdev->dev, "clk_get failed\n");
status = PTR_ERR(mcfqspi->clk); status = PTR_ERR(mcfqspi->clk);
goto fail0; goto fail0;
} }
clk_prepare_enable(mcfqspi->clk);
master->bus_num = pdata->bus_num; master->bus_num = pdata->bus_num;
master->num_chipselect = pdata->num_chipselect; master->num_chipselect = pdata->num_chipselect;
@ -396,7 +395,7 @@ static int mcfqspi_probe(struct platform_device *pdev)
status = mcfqspi_cs_setup(mcfqspi); status = mcfqspi_cs_setup(mcfqspi);
if (status) { if (status) {
dev_dbg(&pdev->dev, "error initializing cs_control\n"); dev_dbg(&pdev->dev, "error initializing cs_control\n");
goto fail1; goto fail0;
} }
init_waitqueue_head(&mcfqspi->waitq); init_waitqueue_head(&mcfqspi->waitq);
@ -414,18 +413,16 @@ static int mcfqspi_probe(struct platform_device *pdev)
status = devm_spi_register_master(&pdev->dev, master); status = devm_spi_register_master(&pdev->dev, master);
if (status) { if (status) {
dev_dbg(&pdev->dev, "spi_register_master failed\n"); dev_dbg(&pdev->dev, "spi_register_master failed\n");
goto fail2; goto fail1;
} }
dev_info(&pdev->dev, "Coldfire QSPI bus driver\n"); dev_info(&pdev->dev, "Coldfire QSPI bus driver\n");
return 0; return 0;
fail2: fail1:
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
mcfqspi_cs_teardown(mcfqspi); mcfqspi_cs_teardown(mcfqspi);
fail1:
clk_disable_unprepare(mcfqspi->clk);
fail0: fail0:
spi_master_put(master); spi_master_put(master);