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

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
...@@ -397,7 +397,7 @@ static __devinit int spdif_probe(struct platform_device *pdev) ...@@ -397,7 +397,7 @@ static __devinit int spdif_probe(struct platform_device *pdev)
ret = -ENOENT; ret = -ENOENT;
goto err0; goto err0;
} }
clk_enable(spdif->pclk); clk_prepare_enable(spdif->pclk);
spdif->sclk = clk_get(&pdev->dev, "sclk_spdif"); spdif->sclk = clk_get(&pdev->dev, "sclk_spdif");
if (IS_ERR(spdif->sclk)) { if (IS_ERR(spdif->sclk)) {
...@@ -405,7 +405,7 @@ static __devinit int spdif_probe(struct platform_device *pdev) ...@@ -405,7 +405,7 @@ static __devinit int spdif_probe(struct platform_device *pdev)
ret = -ENOENT; ret = -ENOENT;
goto err1; goto err1;
} }
clk_enable(spdif->sclk); clk_prepare_enable(spdif->sclk);
/* Request S/PDIF Register's memory region */ /* Request S/PDIF Register's memory region */
if (!request_mem_region(mem_res->start, if (!request_mem_region(mem_res->start,
...@@ -444,10 +444,10 @@ static __devinit int spdif_probe(struct platform_device *pdev) ...@@ -444,10 +444,10 @@ static __devinit int spdif_probe(struct platform_device *pdev)
err3: err3:
release_mem_region(mem_res->start, resource_size(mem_res)); release_mem_region(mem_res->start, resource_size(mem_res));
err2: err2:
clk_disable(spdif->sclk); clk_disable_unprepare(spdif->sclk);
clk_put(spdif->sclk); clk_put(spdif->sclk);
err1: err1:
clk_disable(spdif->pclk); clk_disable_unprepare(spdif->pclk);
clk_put(spdif->pclk); clk_put(spdif->pclk);
err0: err0:
return ret; return ret;
...@@ -466,9 +466,9 @@ static __devexit int spdif_remove(struct platform_device *pdev) ...@@ -466,9 +466,9 @@ static __devexit int spdif_remove(struct platform_device *pdev)
if (mem_res) if (mem_res)
release_mem_region(mem_res->start, resource_size(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_put(spdif->sclk);
clk_disable(spdif->pclk); clk_disable_unprepare(spdif->pclk);
clk_put(spdif->pclk); clk_put(spdif->pclk);
return 0; return 0;
......
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