summaryrefslogtreecommitdiff
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2014-03-02 23:43:11 -0800
committerMark Brown <broonie@linaro.org>2014-03-04 12:13:49 +0800
commit468be93eb4e28c5710ed8acc1b938937707e537c (patch)
tree3a98ff1ed35f443fb101ef7d92c108bbb62dbce7 /sound/soc/sh
parent374e5426377604a94d672650ef22dd2b4285de17 (diff)
ASoC: rsnd: use devm_clk_get() instead of clk_get()
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/sh')
-rw-r--r--sound/soc/sh/rcar/adg.c24
1 files changed, 9 insertions, 15 deletions
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 69d9394f3697..a05ad8159824 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -405,11 +405,11 @@ int rsnd_adg_probe(struct platform_device *pdev,
return -ENOMEM;
}
- clk_orig = clk_get(dev, NULL);
- adg->clk[CLKA] = clk_get(dev, "clk_a");
- adg->clk[CLKB] = clk_get(dev, "clk_b");
- adg->clk[CLKC] = clk_get(dev, "clk_c");
- adg->clk[CLKI] = clk_get(dev, "clk_i");
+ clk_orig = devm_clk_get(dev, NULL);
+ adg->clk[CLKA] = devm_clk_get(dev, "clk_a");
+ adg->clk[CLKB] = devm_clk_get(dev, "clk_b");
+ adg->clk[CLKC] = devm_clk_get(dev, "clk_c");
+ adg->clk[CLKI] = devm_clk_get(dev, "clk_i");
/*
* It request device dependent audio clock.
@@ -432,10 +432,10 @@ int rsnd_adg_probe(struct platform_device *pdev,
* but will be removed soon
*/
if (use_old_style) {
- adg->clk[CLKA] = clk_get(NULL, "audio_clk_a");
- adg->clk[CLKB] = clk_get(NULL, "audio_clk_b");
- adg->clk[CLKC] = clk_get(NULL, "audio_clk_c");
- adg->clk[CLKI] = clk_get(NULL, "audio_clk_internal");
+ adg->clk[CLKA] = devm_clk_get(NULL, "audio_clk_a");
+ adg->clk[CLKB] = devm_clk_get(NULL, "audio_clk_b");
+ adg->clk[CLKC] = devm_clk_get(NULL, "audio_clk_c");
+ adg->clk[CLKI] = devm_clk_get(NULL, "audio_clk_internal");
}
for_each_rsnd_clk(clk, adg, i) {
@@ -457,10 +457,4 @@ int rsnd_adg_probe(struct platform_device *pdev,
void rsnd_adg_remove(struct platform_device *pdev,
struct rsnd_priv *priv)
{
- struct rsnd_adg *adg = priv->adg;
- struct clk *clk;
- int i;
-
- for_each_rsnd_clk(clk, adg, i)
- clk_put(clk);
}