@@ -500,7 +500,7 @@ static int tm2_probe(struct platform_device *pdev)
card->dai_link[i].platform_of_node = cpu_dai_node;
}
- priv->codec_mclk1 = of_clk_get_by_name(codec_dai_node, "mclk1");
+ priv->codec_mclk1 = devm_clk_get(dev, "mclk1");
if (IS_ERR(priv->codec_mclk1)) {
dev_err(dev, "Failed to get mclk1 clock\n");
ret = PTR_ERR(priv->codec_mclk1);
@@ -508,7 +508,7 @@ static int tm2_probe(struct platform_device *pdev)
}
/* mclk2 is optional */
- priv->codec_mclk2 = of_clk_get_by_name(codec_dai_node, "mclk2");
+ priv->codec_mclk2 = devm_clk_get(dev, "mclk2");
if (IS_ERR(priv->codec_mclk2))
dev_info(dev, "Not using mclk2 clock\n");
@@ -516,21 +516,17 @@ static int tm2_probe(struct platform_device *pdev)
tm2_ext_dai, ARRAY_SIZE(tm2_ext_dai));
if (ret < 0) {
dev_err(dev, "Failed to register component: %d\n", ret);
- goto err_put_mclk;
+ goto err_put_codec_dai;
}
ret = devm_snd_soc_register_card(dev, card);
if (ret < 0) {
dev_err(dev, "Failed to register card: %d\n", ret);
- goto err_put_mclk;
+ goto err_put_codec_dai;
}
return 0;
-err_put_mclk:
- clk_put(priv->codec_mclk1);
- if (!IS_ERR(priv->codec_mclk2))
- clk_put(priv->codec_mclk2);
err_put_codec_dai:
of_node_put(codec_dai_node);
err_put_cpu_dai:
@@ -543,11 +539,6 @@ err_put_amp:
static int tm2_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = &tm2_card;
- struct tm2_machine_priv *priv = snd_soc_card_get_drvdata(card);
-
- clk_put(priv->codec_mclk1);
- if (!IS_ERR(priv->codec_mclk2))
- clk_put(priv->codec_mclk2);
Regards,