diff options
author | Mark Brown <broonie@linaro.org> | 2013-07-15 13:13:35 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-07-16 08:59:26 -0400 |
commit | 7497185f8c5a3e0dc92765bfc723900b492cd8a4 (patch) | |
tree | 030de1f978e0035a5b873b8ff9ea1f1d2f040694 /sound/soc/samsung | |
parent | ad81f0545ef01ea651886dddac4bef6cec930092 (diff) |
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) | |||
395 | 395 | ||
396 | spin_lock_init(&spdif->lock); | 396 | spin_lock_init(&spdif->lock); |
397 | 397 | ||
398 | spdif->pclk = clk_get(&pdev->dev, "spdif"); | 398 | spdif->pclk = devm_clk_get(&pdev->dev, "spdif"); |
399 | if (IS_ERR(spdif->pclk)) { | 399 | if (IS_ERR(spdif->pclk)) { |
400 | dev_err(&pdev->dev, "failed to get peri-clock\n"); | 400 | dev_err(&pdev->dev, "failed to get peri-clock\n"); |
401 | ret = -ENOENT; | 401 | ret = -ENOENT; |
@@ -403,7 +403,7 @@ static int spdif_probe(struct platform_device *pdev) | |||
403 | } | 403 | } |
404 | clk_prepare_enable(spdif->pclk); | 404 | clk_prepare_enable(spdif->pclk); |
405 | 405 | ||
406 | spdif->sclk = clk_get(&pdev->dev, "sclk_spdif"); | 406 | spdif->sclk = devm_clk_get(&pdev->dev, "sclk_spdif"); |
407 | if (IS_ERR(spdif->sclk)) { | 407 | if (IS_ERR(spdif->sclk)) { |
408 | dev_err(&pdev->dev, "failed to get internal source clock\n"); | 408 | dev_err(&pdev->dev, "failed to get internal source clock\n"); |
409 | ret = -ENOENT; | 409 | ret = -ENOENT; |
@@ -457,10 +457,8 @@ err3: | |||
457 | release_mem_region(mem_res->start, resource_size(mem_res)); | 457 | release_mem_region(mem_res->start, resource_size(mem_res)); |
458 | err2: | 458 | err2: |
459 | clk_disable_unprepare(spdif->sclk); | 459 | clk_disable_unprepare(spdif->sclk); |
460 | clk_put(spdif->sclk); | ||
461 | err1: | 460 | err1: |
462 | clk_disable_unprepare(spdif->pclk); | 461 | clk_disable_unprepare(spdif->pclk); |
463 | clk_put(spdif->pclk); | ||
464 | err0: | 462 | err0: |
465 | return ret; | 463 | return ret; |
466 | } | 464 | } |
@@ -480,9 +478,7 @@ static int spdif_remove(struct platform_device *pdev) | |||
480 | release_mem_region(mem_res->start, resource_size(mem_res)); | 478 | release_mem_region(mem_res->start, resource_size(mem_res)); |
481 | 479 | ||
482 | clk_disable_unprepare(spdif->sclk); | 480 | clk_disable_unprepare(spdif->sclk); |
483 | clk_put(spdif->sclk); | ||
484 | clk_disable_unprepare(spdif->pclk); | 481 | clk_disable_unprepare(spdif->pclk); |
485 | clk_put(spdif->pclk); | ||
486 | 482 | ||
487 | return 0; | 483 | return 0; |
488 | } | 484 | } |