[PATCH 5/5] soundwire: qcom: use pm_runtime_resume_and_get()

[Srinivas Kandagatla]

On 27/04/2022 00:56, Bard Liao wrote:
> From: Pierre-Louis Bossart <pierre-louis.bossart at linux.intel.com>
> 
> Use pm_runtime_resume_and_get() to replace the pm_runtime_get_sync() and
> pm_runtime_put_noidle() pattern.
> 
> No functional changes.
> 
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart at linux.intel.com>
> Reviewed-by: Péter Ujfalusi <peter.ujfalusi at linux.intel.com>
> Signed-off-by: Bard Liao <yung-chuan.liao at linux.intel.com>
> ---
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla at linaro.org>

>   drivers/soundwire/qcom.c | 15 ++++++---------
>   1 file changed, 6 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
> index c40c25f2d264..c244d31805cc 100644
> --- a/drivers/soundwire/qcom.c
> +++ b/drivers/soundwire/qcom.c
> @@ -510,12 +510,11 @@ static irqreturn_t qcom_swrm_wake_irq_handler(int irq, void *dev_id)
>   	struct qcom_swrm_ctrl *swrm = dev_id;
>   	int ret;
>   
> -	ret = pm_runtime_get_sync(swrm->dev);
> +	ret = pm_runtime_resume_and_get(swrm->dev);
>   	if (ret < 0 && ret != -EACCES) {
>   		dev_err_ratelimited(swrm->dev,
> -				    "pm_runtime_get_sync failed in %s, ret %d\n",
> +				    "pm_runtime_resume_and_get failed in %s, ret %d\n",
>   				    __func__, ret);
> -		pm_runtime_put_noidle(swrm->dev);
>   		return ret;
>   	}
>   
> @@ -1059,12 +1058,11 @@ static int qcom_swrm_startup(struct snd_pcm_substream *substream,
>   	struct snd_soc_dai *codec_dai;
>   	int ret, i;
>   
> -	ret = pm_runtime_get_sync(ctrl->dev);
> +	ret = pm_runtime_resume_and_get(ctrl->dev);
>   	if (ret < 0 && ret != -EACCES) {
>   		dev_err_ratelimited(ctrl->dev,
> -				    "pm_runtime_get_sync failed in %s, ret %d\n",
> +				    "pm_runtime_resume_and_get failed in %s, ret %d\n",
>   				    __func__, ret);
> -		pm_runtime_put_noidle(ctrl->dev);
>   		return ret;
>   	}
>   
> @@ -1253,12 +1251,11 @@ static int swrm_reg_show(struct seq_file *s_file, void *data)
>   	struct qcom_swrm_ctrl *swrm = s_file->private;
>   	int reg, reg_val, ret;
>   
> -	ret = pm_runtime_get_sync(swrm->dev);
> +	ret = pm_runtime_resume_and_get(swrm->dev);
>   	if (ret < 0 && ret != -EACCES) {
>   		dev_err_ratelimited(swrm->dev,
> -				    "pm_runtime_get_sync failed in %s, ret %d\n",
> +				    "pm_runtime_resume_and_get failed in %s, ret %d\n",
>   				    __func__, ret);
> -		pm_runtime_put_noidle(swrm->dev);
>   		return ret;
>   	}
>