Unverified Commit 20c475d2 authored by Andi Shyti's avatar Andi Shyti Committed by Mark Brown
Browse files

spi: s3c64xx: Use devm_clk_get_enabled() 



Replace the tuple devm_clk_get()/clk_prepare_enable() with the
single function devm_clk_get_enabled().

Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20230531205550.568340-1-andi.shyti@kernel.org


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

drivers/spi/spi-s3c64xx.c

+5 −34
Original line number Diff line number Diff line
@@ -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);