ASoC: codecs: wm8962: using pm_runtime_resume_and_get instead of pm_runtime_get_sync
authorMinghao Chi <chi.minghao@zte.com.cn>
Mon, 18 Apr 2022 11:02:59 +0000 (11:02 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 19 Apr 2022 11:04:08 +0000 (12:04 +0100)
Using pm_runtime_resume_and_get is more appropriate
for simplifing code

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220418110259.2559144-1-chi.minghao@zte.com.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/wm8962.c

index 079ad5b..34cd5a2 100644 (file)
@@ -2896,9 +2896,8 @@ static int wm8962_set_fll(struct snd_soc_component *component, int fll_id, int s
 
        reinit_completion(&wm8962->fll_lock);
 
-       ret = pm_runtime_get_sync(component->dev);
+       ret = pm_runtime_resume_and_get(component->dev);
        if (ret < 0) {
-               pm_runtime_put_noidle(component->dev);
                dev_err(component->dev, "Failed to resume device: %d\n", ret);
                return ret;
        }
@@ -3030,9 +3029,8 @@ static irqreturn_t wm8962_irq(int irq, void *data)
        unsigned int active;
        int reg, ret;
 
-       ret = pm_runtime_get_sync(dev);
+       ret = pm_runtime_resume_and_get(dev);
        if (ret < 0) {
-               pm_runtime_put_noidle(dev);
                dev_err(dev, "Failed to resume: %d\n", ret);
                return IRQ_NONE;
        }