Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d01e9b2 authored by Thomas Abraham's avatar Thomas Abraham Committed by Mark Brown
Browse files

ASoC: SAMSUNG: spdif: use clk_prepare_enable and clk_disable_unprepare 



Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
calls as required by common clock framework.

Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Acked-by: default avatarSangbeom Kim <sbkim73@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent dc2c9eb8

sound/soc/samsung/spdif.c

+6 −6
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ static __devinit int spdif_probe(struct platform_device *pdev) 
		ret = -ENOENT;

		goto err0;

	}

	clk_enable(spdif->pclk);

	clk_prepare_enable(spdif->pclk);



	spdif->sclk = clk_get(&pdev->dev, "sclk_spdif");

	if (IS_ERR(spdif->sclk)) {
@@ -405,7 +405,7 @@ static __devinit int spdif_probe(struct platform_device *pdev) 
		ret = -ENOENT;

		goto err1;

	}

	clk_enable(spdif->sclk);

	clk_prepare_enable(spdif->sclk);



	/* Request S/PDIF Register's memory region */

	if (!request_mem_region(mem_res->start,
@@ -444,10 +444,10 @@ static __devinit int spdif_probe(struct platform_device *pdev) 
err3:

	release_mem_region(mem_res->start, resource_size(mem_res));

err2:

	clk_disable(spdif->sclk);

	clk_disable_unprepare(spdif->sclk);

	clk_put(spdif->sclk);

err1:

	clk_disable(spdif->pclk);

	clk_disable_unprepare(spdif->pclk);

	clk_put(spdif->pclk);

err0:

	return ret;
@@ -466,9 +466,9 @@ static __devexit int spdif_remove(struct platform_device *pdev) 
	if (mem_res)

		release_mem_region(mem_res->start, resource_size(mem_res));



	clk_disable(spdif->sclk);

	clk_disable_unprepare(spdif->sclk);

	clk_put(spdif->sclk);

	clk_disable(spdif->pclk);

	clk_disable_unprepare(spdif->pclk);

	clk_put(spdif->pclk);



	return 0;