summaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-26 12:16:50 +0100
committerMark Brown <broonie@linaro.org>2013-06-27 09:44:59 +0100
commitcfe68642cff7c121f38a088a795759fd3500122c (patch)
treea8157f6916bc5b8540e2882b7353716a54ca45b5 /sound/soc/tegra
parentad3ae47b109358511a807a7859822890c59a06ec (diff)
downloadop-kernel-dev-cfe68642cff7c121f38a088a795759fd3500122c.zip
op-kernel-dev-cfe68642cff7c121f38a088a795759fd3500122c.tar.gz
ASoC: tegra20-ac97: Convert to devm_clk_get()
Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r--sound/soc/tegra/tegra20_ac97.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
index 2f70ea7..d8c142d 100644
--- a/sound/soc/tegra/tegra20_ac97.c
+++ b/sound/soc/tegra/tegra20_ac97.c
@@ -327,7 +327,7 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
}
dev_set_drvdata(&pdev->dev, ac97);
- ac97->clk_ac97 = clk_get(&pdev->dev, NULL);
+ ac97->clk_ac97 = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(ac97->clk_ac97)) {
dev_err(&pdev->dev, "Can't retrieve ac97 clock\n");
ret = PTR_ERR(ac97->clk_ac97);
@@ -443,7 +443,6 @@ err_unregister_pcm:
err_unregister_component:
snd_soc_unregister_component(&pdev->dev);
err_clk_put:
- clk_put(ac97->clk_ac97);
err:
return ret;
}
@@ -458,7 +457,6 @@ static int tegra20_ac97_platform_remove(struct platform_device *pdev)
tegra_asoc_utils_fini(&ac97->util_data);
clk_disable_unprepare(ac97->clk_ac97);
- clk_put(ac97->clk_ac97);
return 0;
}
OpenPOWER on IntegriCloud