aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Abraham <thomas.abraham@linaro.org>2012-10-02 19:46:01 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-14 22:29:37 -0400
commit54f174ab292aa7dec0d7daac6d5654492e40296a (patch)
tree332b135db3e67fc85c99a9dd144efbc0f07b0521
parentddffeb8c4d0331609ef2581d84de4d763607bd37 (diff)
ASoC: SAMSUNG: ac97: 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>
-rw-r--r--sound/soc/samsung/ac97.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
index 14fbcd30cae5..386bab1f99ab 100644
--- a/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -442,7 +442,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev)
442 ret = -ENODEV; 442 ret = -ENODEV;
443 goto err2; 443 goto err2;
444 } 444 }
445 clk_enable(s3c_ac97.ac97_clk); 445 clk_prepare_enable(s3c_ac97.ac97_clk);
446 446
447 if (ac97_pdata->cfg_gpio(pdev)) { 447 if (ac97_pdata->cfg_gpio(pdev)) {
448 dev_err(&pdev->dev, "Unable to configure gpio\n"); 448 dev_err(&pdev->dev, "Unable to configure gpio\n");
@@ -468,7 +468,7 @@ err5:
468 free_irq(irq_res->start, NULL); 468 free_irq(irq_res->start, NULL);
469err4: 469err4:
470err3: 470err3:
471 clk_disable(s3c_ac97.ac97_clk); 471 clk_disable_unprepare(s3c_ac97.ac97_clk);
472 clk_put(s3c_ac97.ac97_clk); 472 clk_put(s3c_ac97.ac97_clk);
473err2: 473err2:
474 iounmap(s3c_ac97.regs); 474 iounmap(s3c_ac97.regs);
@@ -488,7 +488,7 @@ static __devexit int s3c_ac97_remove(struct platform_device *pdev)
488 if (irq_res) 488 if (irq_res)
489 free_irq(irq_res->start, NULL); 489 free_irq(irq_res->start, NULL);
490 490
491 clk_disable(s3c_ac97.ac97_clk); 491 clk_disable_unprepare(s3c_ac97.ac97_clk);
492 clk_put(s3c_ac97.ac97_clk); 492 clk_put(s3c_ac97.ac97_clk);
493 493
494 iounmap(s3c_ac97.regs); 494 iounmap(s3c_ac97.regs);