Commit 7497185f authored by Mark Brown's avatar Mark Brown

ASoC: samsung-spdif: Convert to devm_clk_get()

Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent ad81f054
...@@ -395,7 +395,7 @@ static int spdif_probe(struct platform_device *pdev) ...@@ -395,7 +395,7 @@ static int spdif_probe(struct platform_device *pdev)
spin_lock_init(&spdif->lock); 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)) { if (IS_ERR(spdif->pclk)) {
dev_err(&pdev->dev, "failed to get peri-clock\n"); dev_err(&pdev->dev, "failed to get peri-clock\n");
ret = -ENOENT; ret = -ENOENT;
...@@ -403,7 +403,7 @@ static int spdif_probe(struct platform_device *pdev) ...@@ -403,7 +403,7 @@ static int spdif_probe(struct platform_device *pdev)
} }
clk_prepare_enable(spdif->pclk); 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)) { if (IS_ERR(spdif->sclk)) {
dev_err(&pdev->dev, "failed to get internal source clock\n"); dev_err(&pdev->dev, "failed to get internal source clock\n");
ret = -ENOENT; ret = -ENOENT;
...@@ -457,10 +457,8 @@ static int spdif_probe(struct platform_device *pdev) ...@@ -457,10 +457,8 @@ static int spdif_probe(struct platform_device *pdev)
release_mem_region(mem_res->start, resource_size(mem_res)); release_mem_region(mem_res->start, resource_size(mem_res));
err2: err2:
clk_disable_unprepare(spdif->sclk); clk_disable_unprepare(spdif->sclk);
clk_put(spdif->sclk);
err1: err1:
clk_disable_unprepare(spdif->pclk); clk_disable_unprepare(spdif->pclk);
clk_put(spdif->pclk);
err0: err0:
return ret; return ret;
} }
...@@ -480,9 +478,7 @@ static int spdif_remove(struct platform_device *pdev) ...@@ -480,9 +478,7 @@ static int spdif_remove(struct platform_device *pdev)
release_mem_region(mem_res->start, resource_size(mem_res)); release_mem_region(mem_res->start, resource_size(mem_res));
clk_disable_unprepare(spdif->sclk); clk_disable_unprepare(spdif->sclk);
clk_put(spdif->sclk);
clk_disable_unprepare(spdif->pclk); clk_disable_unprepare(spdif->pclk);
clk_put(spdif->pclk);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment