aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung
diff options
context:
space:
mode:
authorThomas Abraham <thomas.abraham@linaro.org>2012-10-02 19:48:25 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-14 22:29:38 -0400
commit9d01e9b246c37878098056e74a2f8862dc66812e (patch)
tree7e839e89dabf52fd713819a6cfd14be3827e0047 /sound/soc/samsung
parentdc2c9eb8af4e8a431a56d30cde5f5299b1ed6ecf (diff)
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: Thomas Abraham <thomas.abraham@linaro.org> Acked-by: Sangbeom Kim <sbkim73@samsung.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r--sound/soc/samsung/spdif.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c
index bc24c7af02b2..5f3b06d36e9c 100644
--- a/sound/soc/samsung/spdif.c
+++ b/sound/soc/samsung/spdif.c
@@ -397,7 +397,7 @@ static __devinit int spdif_probe(struct platform_device *pdev)
397 ret = -ENOENT; 397 ret = -ENOENT;
398 goto err0; 398 goto err0;
399 } 399 }
400 clk_enable(spdif->pclk); 400 clk_prepare_enable(spdif->pclk);
401 401
402 spdif->sclk = clk_get(&pdev->dev, "sclk_spdif"); 402 spdif->sclk = clk_get(&pdev->dev, "sclk_spdif");
403 if (IS_ERR(spdif->sclk)) { 403 if (IS_ERR(spdif->sclk)) {
@@ -405,7 +405,7 @@ static __devinit int spdif_probe(struct platform_device *pdev)
405 ret = -ENOENT; 405 ret = -ENOENT;
406 goto err1; 406 goto err1;
407 } 407 }
408 clk_enable(spdif->sclk); 408 clk_prepare_enable(spdif->sclk);
409 409
410 /* Request S/PDIF Register's memory region */ 410 /* Request S/PDIF Register's memory region */
411 if (!request_mem_region(mem_res->start, 411 if (!request_mem_region(mem_res->start,
@@ -444,10 +444,10 @@ err4:
444err3: 444err3:
445 release_mem_region(mem_res->start, resource_size(mem_res)); 445 release_mem_region(mem_res->start, resource_size(mem_res));
446err2: 446err2:
447 clk_disable(spdif->sclk); 447 clk_disable_unprepare(spdif->sclk);
448 clk_put(spdif->sclk); 448 clk_put(spdif->sclk);
449err1: 449err1:
450 clk_disable(spdif->pclk); 450 clk_disable_unprepare(spdif->pclk);
451 clk_put(spdif->pclk); 451 clk_put(spdif->pclk);
452err0: 452err0:
453 return ret; 453 return ret;
@@ -466,9 +466,9 @@ static __devexit int spdif_remove(struct platform_device *pdev)
466 if (mem_res) 466 if (mem_res)
467 release_mem_region(mem_res->start, resource_size(mem_res)); 467 release_mem_region(mem_res->start, resource_size(mem_res));
468 468
469 clk_disable(spdif->sclk); 469 clk_disable_unprepare(spdif->sclk);
470 clk_put(spdif->sclk); 470 clk_put(spdif->sclk);
471 clk_disable(spdif->pclk); 471 clk_disable_unprepare(spdif->pclk);
472 clk_put(spdif->pclk); 472 clk_put(spdif->pclk);
473 473
474 return 0; 474 return 0;