ASoC: mediatek: mt8192-afe-pcm: Convert to devm_pm_runtime_enable()

Switch from pm_runtime_enable() to devm_pm_runtime_enable(), allowing
to remove all gotos from the probe function.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Link: https://msgid.link/r/20240313110147.1267793-2-angelogioacchino.delregno@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c b/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c
index bdd1e91824d9cf39f7284cc26f35674b9b29cdfa..794419d16b01bff0a7b6a9133be8905ec00e9c8c 100644 (file)
--- a/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c
+++ b/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c
@@ -2217,21 +2217,20 @@ static int mt8192_afe_pcm_dev_probe(struct platform_device *pdev)
                return ret;
        }
 
-       pm_runtime_enable(&pdev->dev);
-       if (!pm_runtime_enabled(&pdev->dev))
-               goto err_pm_disable;
+       ret = devm_pm_runtime_enable(&pdev->dev);
+       if (ret)
+               return ret;
 
        /* regmap init */
        afe->regmap = syscon_node_to_regmap(dev->parent->of_node);
        if (IS_ERR(afe->regmap)) {
                dev_err(dev, "could not get regmap from parent\n");
-               ret = PTR_ERR(afe->regmap);
-               goto err_pm_disable;
+               return PTR_ERR(afe->regmap);
        }
        ret = regmap_attach_dev(dev, afe->regmap, &mt8192_afe_regmap_config);
        if (ret) {
                dev_warn(dev, "regmap_attach_dev fail, ret %d\n", ret);
-               goto err_pm_disable;
+               return ret;
        }
 
        /* enable clock for regcache get default value from hw */
@@ -2241,7 +2240,7 @@ static int mt8192_afe_pcm_dev_probe(struct platform_device *pdev)
        ret = regmap_reinit_cache(afe->regmap, &mt8192_afe_regmap_config);
        if (ret) {
                dev_err(dev, "regmap_reinit_cache fail, ret %d\n", ret);
-               goto err_pm_disable;
+               return ret;
        }
 
        pm_runtime_put_sync(&pdev->dev);
@@ -2254,10 +2253,8 @@ static int mt8192_afe_pcm_dev_probe(struct platform_device *pdev)
        afe->memif_size = MT8192_MEMIF_NUM;
        afe->memif = devm_kcalloc(dev, afe->memif_size, sizeof(*afe->memif),
                                  GFP_KERNEL);
-       if (!afe->memif) {
-               ret = -ENOMEM;
-               goto err_pm_disable;
-       }
+       if (!afe->memif)
+               return -ENOMEM;
 
        for (i = 0; i < afe->memif_size; i++) {
                afe->memif[i].data = &memif_data[i];
@@ -2271,26 +2268,22 @@ static int mt8192_afe_pcm_dev_probe(struct platform_device *pdev)
        afe->irqs_size = MT8192_IRQ_NUM;
        afe->irqs = devm_kcalloc(dev, afe->irqs_size, sizeof(*afe->irqs),
                                 GFP_KERNEL);
-       if (!afe->irqs) {
-               ret = -ENOMEM;
-               goto err_pm_disable;
-       }
+       if (!afe->irqs)
+               return -ENOMEM;
 
        for (i = 0; i < afe->irqs_size; i++)
                afe->irqs[i].irq_data = &irq_data[i];
 
        /* request irq */
        irq_id = platform_get_irq(pdev, 0);
-       if (irq_id < 0) {
-               ret = irq_id;
-               goto err_pm_disable;
-       }
+       if (irq_id < 0)
+               return irq_id;
 
        ret = devm_request_irq(dev, irq_id, mt8192_afe_irq_handler,
                               IRQF_TRIGGER_NONE, "asys-isr", (void *)afe);
        if (ret) {
                dev_err(dev, "could not request_irq for Afe_ISR_Handle\n");
-               goto err_pm_disable;
+               return ret;
        }
 
        /* init sub_dais */
@@ -2301,7 +2294,7 @@ static int mt8192_afe_pcm_dev_probe(struct platform_device *pdev)
                if (ret) {
                        dev_warn(afe->dev, "dai register i %d fail, ret %d\n",
                                 i, ret);
-                       goto err_pm_disable;
+                       return ret;
                }
        }
 
@@ -2310,7 +2303,7 @@ static int mt8192_afe_pcm_dev_probe(struct platform_device *pdev)
        if (ret) {
                dev_warn(afe->dev, "mtk_afe_combine_sub_dai fail, ret %d\n",
                         ret);
-               goto err_pm_disable;
+               return ret;
        }
 
        /* others */
@@ -2329,7 +2322,7 @@ static int mt8192_afe_pcm_dev_probe(struct platform_device *pdev)
                                              &mt8192_afe_component, NULL, 0);
        if (ret) {
                dev_warn(dev, "err_platform\n");
-               goto err_pm_disable;
+               return ret;
        }
 
        ret = devm_snd_soc_register_component(&pdev->dev,
@@ -2338,15 +2331,10 @@ static int mt8192_afe_pcm_dev_probe(struct platform_device *pdev)
                                              afe->num_dai_drivers);
        if (ret) {
                dev_warn(dev, "err_dai_component\n");
-               goto err_pm_disable;
+               return ret;
        }
 
        return 0;
-
-err_pm_disable:
-       pm_runtime_disable(&pdev->dev);
-
-       return ret;
 }
 
 static void mt8192_afe_pcm_dev_remove(struct platform_device *pdev)