[PATCH 3/5] ASoC: mediatek: mt8195-afe-pcm: Simplify runtime PM during probe

[Trevor Wu (吳文良)]

On Wed, 2023-05-03 at 13:34 +0200, AngeloGioacchino Del Regno wrote:
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
> 
> 
> Use devm_pm_runtime_enable() and pm_runtime_resume_and_get() to
> to simplify the probe function.
> 
> Signed-off-by: AngeloGioacchino Del Regno <
> angelogioacchino.delregno at collabora.com>

Acked-by: Trevor Wu <trevor.wu at mediatek.com>
> ---
>  sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 22 ++++++++++++------
> ----
>  1 file changed, 12 insertions(+), 10 deletions(-)
> 
> diff --git a/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c
> b/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c
> index 9e45efeada55..a54c16e0aa05 100644
> --- a/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c
> +++ b/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c
> @@ -3179,16 +3179,16 @@ static int mt8195_afe_pcm_dev_probe(struct
> platform_device *pdev)
> 
>         mt8195_afe_parse_of(afe, pdev->dev.of_node);
> 
> -       pm_runtime_enable(dev);
> -       if (!pm_runtime_enabled(dev)) {
> -               ret = mt8195_afe_runtime_resume(dev);
> -               if (ret)
> -                       return ret;
> -       }
> -
>         /* enable clock for regcache get default value from hw */
>         afe_priv->pm_runtime_bypass_reg_ctl = true;
> -       pm_runtime_get_sync(dev);
> +
> +       ret = devm_pm_runtime_enable(dev);
> +       if (ret)
> +               return ret;
> +
> +       ret = pm_runtime_resume_and_get(dev);
> +       if (ret)
> +               return dev_err_probe(dev, ret, "Failed to resume
> device\n");
> 
>         afe->regmap = devm_regmap_init_mmio(&pdev->dev, afe-
> >base_addr,
>                                             &mt8195_afe_regmap_config
> );
> @@ -3238,7 +3238,10 @@ static int mt8195_afe_pcm_dev_probe(struct
> platform_device *pdev)
> 
>         mt8195_afe_init_registers(afe);
> 
> -       pm_runtime_put_sync(dev);
> +       ret = pm_runtime_put_sync(dev);
> +       if (ret)
> +               return dev_err_probe(dev, ret, "Failed to suspend
> device\n");
> +
>         afe_priv->pm_runtime_bypass_reg_ctl = false;
> 
>         regcache_cache_only(afe->regmap, true);
> @@ -3248,7 +3251,6 @@ static int mt8195_afe_pcm_dev_probe(struct
> platform_device *pdev)
> 
>  err_pm_put:
>         pm_runtime_put_sync(dev);
> -       pm_runtime_disable(dev);
> 
>         return ret;
>  }
> --
> 2.40.1
> 
>