media: ipu3: use pm_runtime_resume_and_get()
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Fri, 23 Apr 2021 15:19:17 +0000 (17:19 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 19 May 2021 07:51:42 +0000 (09:51 +0200)
Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter")
added pm_runtime_resume_and_get() in order to automatically handle
dev->power.usage_count decrement on errors.

Use the new API, in order to cleanup the error check logic.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c

index fecef85..ca8040d 100644 (file)
@@ -975,10 +975,9 @@ static int cio2_vb2_start_streaming(struct vb2_queue *vq, unsigned int count)
        cio2->cur_queue = q;
        atomic_set(&q->frame_sequence, 0);
 
-       r = pm_runtime_get_sync(&cio2->pci_dev->dev);
+       r = pm_runtime_resume_and_get(&cio2->pci_dev->dev);
        if (r < 0) {
                dev_info(&cio2->pci_dev->dev, "failed to set power %d\n", r);
-               pm_runtime_put_noidle(&cio2->pci_dev->dev);
                return r;
        }