Unverified Commit 2ca0ec01 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Mark Brown
Browse files

ASoC: mediatek: mt8195-afe-pcm: Simplify runtime PM during probe 



Use devm_pm_runtime_enable() and pm_runtime_resume_and_get() to
to simplify the probe function.

Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20230503113413.149235-4-angelogioacchino.delregno@collabora.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 686d0416

sound/soc/mediatek/mt8195/mt8195-afe-pcm.c

+12 −10
Original line number Diff line number Diff line
@@ -3160,16 +3160,16 @@ static int mt8195_afe_pcm_dev_probe(struct platform_device *pdev) 
		dev_dbg(afe->dev, "Cannot find topckgen controller: %ld\n",

			PTR_ERR(afe_priv->topckgen));



	pm_runtime_enable(dev);

	if (!pm_runtime_enabled(dev)) {

		ret = mt8195_afe_runtime_resume(dev);

	/* enable clock for regcache get default value from hw */

	afe_priv->pm_runtime_bypass_reg_ctl = true;



	ret = devm_pm_runtime_enable(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 = 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);
@@ -3222,7 +3222,10 @@ static int mt8195_afe_pcm_dev_probe(struct platform_device *pdev) 
	if (ret)

		goto err_pm_put;



	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);
@@ -3232,7 +3235,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;

}