Skip to content

Commit

Permalink
ASoC: rsnd: use devm_clk_get() instead of clk_get()
Browse files Browse the repository at this point in the history
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Mar 4, 2014
1 parent 374e542 commit 468be93
Showing 1 changed file with 9 additions and 15 deletions.
24 changes: 9 additions & 15 deletions sound/soc/sh/rcar/adg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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) {
Expand All @@ -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);
}

0 comments on commit 468be93

Please sign in to comment.