diff options
author | Mark Brown <broonie@linaro.org> | 2013-07-15 18:13:35 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-07-16 13:59:26 +0100 |
commit | 7497185f8c5a3e0dc92765bfc723900b492cd8a4 (patch) | |
tree | 030de1f978e0035a5b873b8ff9ea1f1d2f040694 /sound/soc/samsung | |
parent | ad81f0545ef01ea651886dddac4bef6cec930092 (diff) | |
download | linux-stable-7497185f8c5a3e0dc92765bfc723900b492cd8a4.tar.gz linux-stable-7497185f8c5a3e0dc92765bfc723900b492cd8a4.tar.bz2 linux-stable-7497185f8c5a3e0dc92765bfc723900b492cd8a4.zip |
ASoC: samsung-spdif: Convert to devm_clk_get()
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r-- | sound/soc/samsung/spdif.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index 2e5ebb2f1982..5ea70ab0ecb5 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c @@ -395,7 +395,7 @@ static int spdif_probe(struct platform_device *pdev) spin_lock_init(&spdif->lock); - spdif->pclk = clk_get(&pdev->dev, "spdif"); + spdif->pclk = devm_clk_get(&pdev->dev, "spdif"); if (IS_ERR(spdif->pclk)) { dev_err(&pdev->dev, "failed to get peri-clock\n"); ret = -ENOENT; @@ -403,7 +403,7 @@ static int spdif_probe(struct platform_device *pdev) } clk_prepare_enable(spdif->pclk); - spdif->sclk = clk_get(&pdev->dev, "sclk_spdif"); + spdif->sclk = devm_clk_get(&pdev->dev, "sclk_spdif"); if (IS_ERR(spdif->sclk)) { dev_err(&pdev->dev, "failed to get internal source clock\n"); ret = -ENOENT; @@ -457,10 +457,8 @@ err3: release_mem_region(mem_res->start, resource_size(mem_res)); err2: clk_disable_unprepare(spdif->sclk); - clk_put(spdif->sclk); err1: clk_disable_unprepare(spdif->pclk); - clk_put(spdif->pclk); err0: return ret; } @@ -480,9 +478,7 @@ static int spdif_remove(struct platform_device *pdev) release_mem_region(mem_res->start, resource_size(mem_res)); clk_disable_unprepare(spdif->sclk); - clk_put(spdif->sclk); clk_disable_unprepare(spdif->pclk); - clk_put(spdif->pclk); return 0; } |