2022-06-16 22:20:20

by Pierre-Louis Bossart

Subject: [PATCH 04/11] ASoC: wcd-mbhc-v2: use pm_runtime_resume_and_get()

simplify the flow. No functionality change, except that on -EACCESS
the reference count will be decreased.

Signed-off-by: Pierre-Louis Bossart <[email protected]>
Reviewed-by: Bard Liao <[email protected]>
Reviewed-by: Kai Vehmanen <[email protected]>
Reviewed-by: Ranjani Sridharan <[email protected]>
---
sound/soc/codecs/wcd-mbhc-v2.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c
index 31009283e7d4a..98baef594bf31 100644
--- a/sound/soc/codecs/wcd-mbhc-v2.c
+++ b/sound/soc/codecs/wcd-mbhc-v2.c
@@ -714,12 +714,11 @@ static int wcd_mbhc_initialise(struct wcd_mbhc *mbhc)
struct snd_soc_component *component = mbhc->component;
int ret;

- ret = pm_runtime_get_sync(component->dev);
+ ret = pm_runtime_resume_and_get(component->dev);
if (ret < 0 && ret != -EACCES) {
dev_err_ratelimited(component->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(component->dev);
return ret;
}

@@ -1097,12 +1096,11 @@ static void wcd_correct_swch_plug(struct work_struct *work)
mbhc = container_of(work, struct wcd_mbhc, correct_plug_swch);
component = mbhc->component;

- ret = pm_runtime_get_sync(component->dev);
+ ret = pm_runtime_resume_and_get(component->dev);
if (ret < 0 && ret != -EACCES) {
dev_err_ratelimited(component->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(component->dev);
return;
}
micbias_mv = wcd_mbhc_get_micbias(mbhc);
--
2.34.1

2022-06-17 21:08:49

by Srinivas Kandagatla

Subject: Re: [PATCH 04/11] ASoC: wcd-mbhc-v2: use pm_runtime_resume_and_get()

On 16/06/2022 15:04, Pierre-Louis Bossart wrote:
> simplify the flow. No functionality change, except that on -EACCESS
> the reference count will be decreased.
>
> Signed-off-by: Pierre-Louis Bossart <[email protected]>
> Reviewed-by: Bard Liao <[email protected]>
> Reviewed-by: Kai Vehmanen <[email protected]>
> Reviewed-by: Ranjani Sridharan <[email protected]>
> ---
Thanks Pierre,

LGTM,
Reviewed-by: Srinivas Kandagatla <[email protected]>

--srini

> sound/soc/codecs/wcd-mbhc-v2.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c
> index 31009283e7d4a..98baef594bf31 100644
> --- a/sound/soc/codecs/wcd-mbhc-v2.c
> +++ b/sound/soc/codecs/wcd-mbhc-v2.c
> @@ -714,12 +714,11 @@ static int wcd_mbhc_initialise(struct wcd_mbhc *mbhc)
> struct snd_soc_component *component = mbhc->component;
> int ret;
>
> - ret = pm_runtime_get_sync(component->dev);
> + ret = pm_runtime_resume_and_get(component->dev);
> if (ret < 0 && ret != -EACCES) {
> dev_err_ratelimited(component->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(component->dev);
> return ret;
> }
>
> @@ -1097,12 +1096,11 @@ static void wcd_correct_swch_plug(struct work_struct *work)
> mbhc = container_of(work, struct wcd_mbhc, correct_plug_swch);
> component = mbhc->component;
>
> - ret = pm_runtime_get_sync(component->dev);
> + ret = pm_runtime_resume_and_get(component->dev);
> if (ret < 0 && ret != -EACCES) {
> dev_err_ratelimited(component->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(component->dev);
> return;
> }
> micbias_mv = wcd_mbhc_get_micbias(mbhc);