spi: s3c64xx: Use devm_clk_get_enabled()
Subsystems (3)
Andi Shyti
maintainerPATCH 1/1 spi: s3c64xx: Use devm_clk_get_enabled()
Replace the tuple devm_clk_get()/clk_prepare_enable() with the single function devm_clk_get_enabled().
--- drivers/spi/spi-s3c64xx.c | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-)
drivers/spi/spi-s3c64xx.c +5 -34
@@ -1244,46 +1244,28 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) }/* Setup clocks */ - sdd->clk =devm_clk_get (&pdev->dev,"spi" ); + sdd->clk =devm_clk_get_enabled (&pdev->dev,"spi" );if (IS_ERR (sdd->clk)) {dev_err (&pdev->dev,"Unable to acquire clock 'spi'\n" ); ret =PTR_ERR (sdd->clk); goto err_deref_master; } - ret =clk_prepare_enable (sdd->clk); -if (ret) { -dev_err (&pdev->dev,"Couldn't enable clock 'spi'\n" ); - goto err_deref_master; - } -sprintf (clk_name,"spi_busclk%d" , sci->src_clk_nr); - sdd->src_clk =devm_clk_get (&pdev->dev, clk_name); + sdd->src_clk =devm_clk_get_enabled (&pdev->dev, clk_name);if (IS_ERR (sdd->src_clk)) {dev_err (&pdev->dev,"Unable to acquire clock '%s'\n" , clk_name); ret =PTR_ERR (sdd->src_clk); - goto err_disable_clk; - } - - ret =clk_prepare_enable (sdd->src_clk); -if (ret) { -dev_err (&pdev->dev,"Couldn't enable clock '%s'\n" , clk_name); - goto err_disable_clk; + goto err_deref_master; }if (sdd->port_conf->clk_ioclk) { - sdd->ioclk =devm_clk_get (&pdev->dev,"spi_ioclk" ); + sdd->ioclk =devm_clk_get_enabled (&pdev->dev,"spi_ioclk" );if (IS_ERR (sdd->ioclk)) {dev_err (&pdev->dev,"Unable to acquire 'ioclk'\n" ); ret =PTR_ERR (sdd->ioclk); - goto err_disable_src_clk; - } - - ret =clk_prepare_enable (sdd->ioclk); -if (ret) { -dev_err (&pdev->dev,"Couldn't enable clock 'ioclk'\n" ); - goto err_disable_src_clk; + goto err_deref_master; } }
@@ -1332,11 +1314,6 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)pm_runtime_disable (&pdev->dev);pm_runtime_set_suspended (&pdev->dev); -clk_disable_unprepare (sdd->ioclk); -err_disable_src_clk: -clk_disable_unprepare (sdd->src_clk); -err_disable_clk: -clk_disable_unprepare (sdd->clk); err_deref_master:spi_master_put (master);
@@ -1357,12 +1334,6 @@ static void s3c64xx_spi_remove(struct platform_device *pdev)dma_release_channel (sdd->tx_dma.ch); } -clk_disable_unprepare (sdd->ioclk); - -clk_disable_unprepare (sdd->src_clk); - -clk_disable_unprepare (sdd->clk); -pm_runtime_put_noidle (&pdev->dev);pm_runtime_disable (&pdev->dev);pm_runtime_set_suspended (&pdev->dev);
Signature · 1 line
2.40.1
Mark Brown
maintainerQuoted 4 lines · Andi Shyti
Replace the tuple devm_clk_get()/clk_prepare_enable() with the single function
devm_clk_get_enabled().
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/1] spi: s3c64xx: Use devm_clk_get_enabled()
commit: 20c475d21ed9326f7b1396c9bb8991b375cb6c50
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark