Merge remote-tracking branch 'asoc/topic/sgtl5000' into asoc-next

1 files changed, 8 insertions, 24 deletions

diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c
index a60aaa053d28..7a8bc1220b2e 100644
--- a/sound/soc/fsl/imx-sgtl5000.c
+++ b/sound/soc/fsl/imx-sgtl5000.c
@@ -128,21 +128,11 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
                 goto fail;
         }
 
-        data->codec_clk = clk_get(&codec_dev->dev, NULL);
-        if (IS_ERR(data->codec_clk)) {
-                /* assuming clock enabled by default */
-                data->codec_clk = NULL;
-                ret = of_property_read_u32(codec_np, "clock-frequency",
-                                        &data->clk_frequency);
-                if (ret) {
-                        dev_err(&codec_dev->dev,
-                                "clock-frequency missing or invalid\n");
-                        goto fail;
-                }
-        } else {
-                data->clk_frequency = clk_get_rate(data->codec_clk);
-                clk_prepare_enable(data->codec_clk);
-        }
+        data->codec_clk = devm_clk_get(&codec_dev->dev, NULL);
+        if (IS_ERR(data->codec_clk))
+                goto fail;
+
+        data->clk_frequency = clk_get_rate(data->codec_clk);
 
         data->dai.name = "HiFi";
         data->dai.stream_name = "HiFi";
@@ -157,10 +147,10 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
         data->card.dev = &pdev->dev;
         ret = snd_soc_of_parse_card_name(&data->card, "model");
         if (ret)
-                goto clk_fail;
+                goto fail;
         ret = snd_soc_of_parse_audio_routing(&data->card, "audio-routing");
         if (ret)
-                goto clk_fail;
+                goto fail;
         data->card.num_links = 1;
         data->card.owner = THIS_MODULE;
         data->card.dai_link = &data->dai;
@@ -170,7 +160,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
         ret = snd_soc_register_card(&data->card);
         if (ret) {
                 dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
-                goto clk_fail;
+                goto fail;
         }
 
         platform_set_drvdata(pdev, data);
@@ -179,8 +169,6 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 
         return 0;
 
-clk_fail:
-        clk_put(data->codec_clk);
 fail:
         if (ssi_np)
                 of_node_put(ssi_np);
@@ -194,10 +182,6 @@ static int imx_sgtl5000_remove(struct platform_device *pdev)
 {
         struct imx_sgtl5000_data *data = platform_get_drvdata(pdev);
 
-        if (data->codec_clk) {
-                clk_disable_unprepare(data->codec_clk);
-                clk_put(data->codec_clk);
-        }
         snd_soc_unregister_card(&data->card);
 
         return 0;