--- Begin Message ---
- To: "lgirdwood@xxxxxxxxx" <lgirdwood@xxxxxxxxx>, "angelogioacchino.delregno@xxxxxxxxxxxxx" <angelogioacchino.delregno@xxxxxxxxxxxxx>
- Subject: Re: [PATCH 3/5] ASoC: mediatek: mt8195-afe-pcm: Simplify runtime PM during probe
- From: Trevor Wu (吳文良) <Trevor.Wu@xxxxxxxxxxxx>
- Date: Wed, 3 May 2023 13:23:17 +0000
- Cc: "sound-open-firmware@xxxxxxxxxxxxxxxx" <sound-open-firmware@xxxxxxxxxxxxxxxx>, "linux-kernel@xxxxxxxxxxxxxxx" <linux-kernel@xxxxxxxxxxxxxxx>, "alsa-devel@xxxxxxxxxxxxxxxx" <alsa-devel@xxxxxxxxxxxxxxxx>, "ribalda@xxxxxxxxxxxx" <ribalda@xxxxxxxxxxxx>, "linux-mediatek@xxxxxxxxxxxxxxxxxxx" <linux-mediatek@xxxxxxxxxxxxxxxxxxx>, "u.kleine-koenig@xxxxxxxxxxxxxx" <u.kleine-koenig@xxxxxxxxxxxxxx>, YC Hung (洪堯俊) <yc.hung@xxxxxxxxxxxx>, "kai.vehmanen@xxxxxxxxxxxxxxx" <kai.vehmanen@xxxxxxxxxxxxxxx>, Chunxu Li (李春旭) <Chunxu.Li@xxxxxxxxxxxx>, "kernel@xxxxxxxxxxxxx" <kernel@xxxxxxxxxxxxx>, "pierre-louis.bossart@xxxxxxxxxxxxxxx" <pierre-louis.bossart@xxxxxxxxxxxxxxx>, Allen-KH Cheng (程冠勳) <Allen-KH.Cheng@xxxxxxxxxxxx>, "broonie@xxxxxxxxxx" <broonie@xxxxxxxxxx>, "tiwai@xxxxxxxx" <tiwai@xxxxxxxx>, "yung-chuan.liao@xxxxxxxxxxxxxxx" <yung-chuan.liao@xxxxxxxxxxxxxxx>, "ranjani.sridharan@xxxxxxxxxxxxxxx" <ranjani.sridharan@xxxxxxxxxxxxxxx>, "linux-arm-kernel@xxxxxxxxxxxxxxxxxxx" <linux-arm-kernel@xxxxxxxxxxxxxxxxxxx>, "matthias.bgg@xxxxxxxxx" <matthias.bgg@xxxxxxxxx>, "peter.ujfalusi@xxxxxxxxxxxxxxx" <peter.ujfalusi@xxxxxxxxxxxxxxx>, "daniel.baluta@xxxxxxx" <daniel.baluta@xxxxxxx>, "nicolas.ferre@xxxxxxxxxxxxx" <nicolas.ferre@xxxxxxxxxxxxx>, TingHan Shen (沈廷翰) <TingHan.Shen@xxxxxxxxxxxx>, "error27@xxxxxxxxx" <error27@xxxxxxxxx>
- In-reply-to: <20230503113413.149235-4-angelogioacchino.delregno@collabora.com>
- References: <20230503113413.149235-1-angelogioacchino.delregno@collabora.com> <20230503113413.149235-4-angelogioacchino.delregno@collabora.com>
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@xxxxxxxxxxxxx>
Acked-by: Trevor Wu <trevor.wu@xxxxxxxxxxxx>
> ---
> 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
>
>
--- End Message ---