Skip to content

Commit

Permalink
ASoC: SAMSUNG: spdif: 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 dc2c9eb commit 9d01e9b
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions sound/soc/samsung/spdif.c
Original file line number Diff line number Diff line change
Expand Up @@ -397,15 +397,15 @@ 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)) {
dev_err(&pdev->dev, "failed to get internal source clock\n");
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,
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 9d01e9b

Please sign in to comment.