diff options
author | Mark Brown <broonie@linaro.org> | 2013-07-15 11:41:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-07-15 11:43:15 -0400 |
commit | 4734dc96ea50109ae08603af10804f989ff35437 (patch) | |
tree | 7104a215e65be4b943987644f7ea2adb59dc4798 | |
parent | 30d3924852c7b07df4e015610aca1cafa5c15cab (diff) |
ASoC: kirkwood-i2s: Use devm_clk_get() for extclk
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/kirkwood/kirkwood-i2s.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 4c9dad3263c5..44412eaf6e81 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c | |||
@@ -498,10 +498,9 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) | |||
498 | if (err < 0) | 498 | if (err < 0) |
499 | return err; | 499 | return err; |
500 | 500 | ||
501 | priv->extclk = clk_get(&pdev->dev, "extclk"); | 501 | priv->extclk = devm_clk_get(&pdev->dev, "extclk"); |
502 | if (!IS_ERR(priv->extclk)) { | 502 | if (!IS_ERR(priv->extclk)) { |
503 | if (priv->extclk == priv->clk) { | 503 | if (priv->extclk == priv->clk) { |
504 | clk_put(priv->extclk); | ||
505 | priv->extclk = ERR_PTR(-EINVAL); | 504 | priv->extclk = ERR_PTR(-EINVAL); |
506 | } else { | 505 | } else { |
507 | dev_info(&pdev->dev, "found external clock\n"); | 506 | dev_info(&pdev->dev, "found external clock\n"); |
@@ -529,10 +528,8 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) | |||
529 | return 0; | 528 | return 0; |
530 | dev_err(&pdev->dev, "snd_soc_register_component failed\n"); | 529 | dev_err(&pdev->dev, "snd_soc_register_component failed\n"); |
531 | 530 | ||
532 | if (!IS_ERR(priv->extclk)) { | 531 | if (!IS_ERR(priv->extclk)) |
533 | clk_disable_unprepare(priv->extclk); | 532 | clk_disable_unprepare(priv->extclk); |
534 | clk_put(priv->extclk); | ||
535 | } | ||
536 | clk_disable_unprepare(priv->clk); | 533 | clk_disable_unprepare(priv->clk); |
537 | 534 | ||
538 | return err; | 535 | return err; |
@@ -544,10 +541,8 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev) | |||
544 | 541 | ||
545 | snd_soc_unregister_component(&pdev->dev); | 542 | snd_soc_unregister_component(&pdev->dev); |
546 | 543 | ||
547 | if (!IS_ERR(priv->extclk)) { | 544 | if (!IS_ERR(priv->extclk)) |
548 | clk_disable_unprepare(priv->extclk); | 545 | clk_disable_unprepare(priv->extclk); |
549 | clk_put(priv->extclk); | ||
550 | } | ||
551 | clk_disable_unprepare(priv->clk); | 546 | clk_disable_unprepare(priv->clk); |
552 | 547 | ||
553 | return 0; | 548 | return 0; |