Message ID | 20220616220427.136036-6-pierre-louis.bossart@linux.intel.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 9a1a28610a1c49bf93777d017aa3fe121eef944e |
Headers | show |
Series | ASoC: use pm_runtime_resume_and_get() when possible | expand |
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 <pierre-louis.bossart@linux.intel.com> > Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> > Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> > Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> > --- Thanks Pierre, LGTM, Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --srini > sound/soc/codecs/wsa881x.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/codecs/wsa881x.c b/sound/soc/codecs/wsa881x.c > index f3a56f3ce4871..dc954b85a9881 100644 > --- a/sound/soc/codecs/wsa881x.c > +++ b/sound/soc/codecs/wsa881x.c > @@ -749,11 +749,9 @@ static int wsa881x_put_pa_gain(struct snd_kcontrol *kc, > unsigned int mask = (1 << fls(max)) - 1; > int val, ret, min_gain, max_gain; > > - ret = pm_runtime_get_sync(comp->dev); > - if (ret < 0 && ret != -EACCES) { > - pm_runtime_put_noidle(comp->dev); > + ret = pm_runtime_resume_and_get(comp->dev); > + if (ret < 0 && ret != -EACCES) > return ret; > - } > > max_gain = (max - ucontrol->value.integer.value[0]) & mask; > /*
diff --git a/sound/soc/codecs/wsa881x.c b/sound/soc/codecs/wsa881x.c index f3a56f3ce4871..dc954b85a9881 100644 --- a/sound/soc/codecs/wsa881x.c +++ b/sound/soc/codecs/wsa881x.c @@ -749,11 +749,9 @@ static int wsa881x_put_pa_gain(struct snd_kcontrol *kc, unsigned int mask = (1 << fls(max)) - 1; int val, ret, min_gain, max_gain; - ret = pm_runtime_get_sync(comp->dev); - if (ret < 0 && ret != -EACCES) { - pm_runtime_put_noidle(comp->dev); + ret = pm_runtime_resume_and_get(comp->dev); + if (ret < 0 && ret != -EACCES) return ret; - } max_gain = (max - ucontrol->value.integer.value[0]) & mask; /*