Unverified Commit 57d71453 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: img: img-i2s-out: use pm_runtime_resume_and_get() 



Simplify the flow.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20220616220427.136036-9-pierre-louis.bossart@linux.intel.com


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

sound/soc/img/img-i2s-out.c

+4 −8
Original line number Diff line number Diff line
@@ -346,11 +346,9 @@ static int img_i2s_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 


	chan_control_mask = IMG_I2S_OUT_CHAN_CTL_CLKT_MASK;



	ret = pm_runtime_get_sync(i2s->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(i2s->dev);

	ret = pm_runtime_resume_and_get(i2s->dev);

	if (ret < 0)

		return ret;

	}



	img_i2s_out_disable(i2s);
@@ -482,11 +480,9 @@ static int img_i2s_out_probe(struct platform_device *pdev) 
		if (ret)

			goto err_pm_disable;

	}

	ret = pm_runtime_get_sync(&pdev->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(&pdev->dev);

	ret = pm_runtime_resume_and_get(&pdev->dev);

	if (ret < 0)

		goto err_suspend;

	}



	reg = IMG_I2S_OUT_CTL_FRM_SIZE_MASK;

	img_i2s_out_writel(i2s, reg, IMG_I2S_OUT_CTL);