diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2014-05-20 23:22:20 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-21 19:20:11 -0400 |
| commit | 1d55417e127985b955e0f87b5dd0c38daaa79cd3 (patch) | |
| tree | aa32530f9d1de29ddb0f2ababeac8b5f00030702 | |
| parent | 7253e354e712d2cab7b640c62c8bb82653447c44 (diff) | |
ASoC: samsung: Add devm_clk_get to pcm.c
clk_get in probe function can be safely replaced with devm_clk_get.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/samsung/pcm.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index 90fcd522be1c..a3c9c9cba3b0 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c | |||
| @@ -542,7 +542,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) | |||
| 542 | /* Default is 128fs */ | 542 | /* Default is 128fs */ |
| 543 | pcm->sclk_per_fs = 128; | 543 | pcm->sclk_per_fs = 128; |
| 544 | 544 | ||
| 545 | pcm->cclk = clk_get(&pdev->dev, "audio-bus"); | 545 | pcm->cclk = devm_clk_get(&pdev->dev, "audio-bus"); |
| 546 | if (IS_ERR(pcm->cclk)) { | 546 | if (IS_ERR(pcm->cclk)) { |
| 547 | dev_err(&pdev->dev, "failed to get audio-bus\n"); | 547 | dev_err(&pdev->dev, "failed to get audio-bus\n"); |
| 548 | ret = PTR_ERR(pcm->cclk); | 548 | ret = PTR_ERR(pcm->cclk); |
| @@ -567,7 +567,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) | |||
| 567 | goto err3; | 567 | goto err3; |
| 568 | } | 568 | } |
| 569 | 569 | ||
| 570 | pcm->pclk = clk_get(&pdev->dev, "pcm"); | 570 | pcm->pclk = devm_clk_get(&pdev->dev, "pcm"); |
| 571 | if (IS_ERR(pcm->pclk)) { | 571 | if (IS_ERR(pcm->pclk)) { |
| 572 | dev_err(&pdev->dev, "failed to get pcm_clock\n"); | 572 | dev_err(&pdev->dev, "failed to get pcm_clock\n"); |
| 573 | ret = -ENOENT; | 573 | ret = -ENOENT; |
| @@ -605,14 +605,12 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) | |||
| 605 | 605 | ||
| 606 | err5: | 606 | err5: |
| 607 | clk_disable_unprepare(pcm->pclk); | 607 | clk_disable_unprepare(pcm->pclk); |
| 608 | clk_put(pcm->pclk); | ||
| 609 | err4: | 608 | err4: |
| 610 | iounmap(pcm->regs); | 609 | iounmap(pcm->regs); |
| 611 | err3: | 610 | err3: |
| 612 | release_mem_region(mem_res->start, resource_size(mem_res)); | 611 | release_mem_region(mem_res->start, resource_size(mem_res)); |
| 613 | err2: | 612 | err2: |
| 614 | clk_disable_unprepare(pcm->cclk); | 613 | clk_disable_unprepare(pcm->cclk); |
| 615 | clk_put(pcm->cclk); | ||
| 616 | err1: | 614 | err1: |
| 617 | return ret; | 615 | return ret; |
| 618 | } | 616 | } |
| @@ -631,8 +629,6 @@ static int s3c_pcm_dev_remove(struct platform_device *pdev) | |||
| 631 | 629 | ||
| 632 | clk_disable_unprepare(pcm->cclk); | 630 | clk_disable_unprepare(pcm->cclk); |
| 633 | clk_disable_unprepare(pcm->pclk); | 631 | clk_disable_unprepare(pcm->pclk); |
| 634 | clk_put(pcm->pclk); | ||
| 635 | clk_put(pcm->cclk); | ||
| 636 | 632 | ||
| 637 | return 0; | 633 | return 0; |
| 638 | } | 634 | } |
