Skip to content

Commit

Permalink
ASoC: SAMSUNG: ac97: use clk_prepare_enable and clk_disable_unprepare
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Abraham authored and Mark Brown committed Oct 15, 2012
1 parent ddffeb8 commit 54f174a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions sound/soc/samsung/ac97.c
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev)
ret = -ENODEV;
goto err2;
}
clk_enable(s3c_ac97.ac97_clk);
clk_prepare_enable(s3c_ac97.ac97_clk);

if (ac97_pdata->cfg_gpio(pdev)) {
dev_err(&pdev->dev, "Unable to configure gpio\n");
Expand All @@ -468,7 +468,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev)
free_irq(irq_res->start, NULL);
err4:
err3:
clk_disable(s3c_ac97.ac97_clk);
clk_disable_unprepare(s3c_ac97.ac97_clk);
clk_put(s3c_ac97.ac97_clk);
err2:
iounmap(s3c_ac97.regs);
Expand All @@ -488,7 +488,7 @@ static __devexit int s3c_ac97_remove(struct platform_device *pdev)
if (irq_res)
free_irq(irq_res->start, NULL);

clk_disable(s3c_ac97.ac97_clk);
clk_disable_unprepare(s3c_ac97.ac97_clk);
clk_put(s3c_ac97.ac97_clk);

iounmap(s3c_ac97.regs);
Expand Down

0 comments on commit 54f174a

Please sign in to comment.