OSDN Git Service

media: vsp1: use pm_runtime_resume_and_get()
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Fri, 23 Apr 2021 15:19:21 +0000 (17:19 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Thu, 20 May 2021 14:02:44 +0000 (16:02 +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.

As a bonus, pm_runtime_resume_and_get() always return 0 on success.
So, the code can be simplified.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/platform/vsp1/vsp1_drv.c

index aa66e4f..de442d6 100644 (file)
@@ -559,15 +559,7 @@ static int vsp1_device_init(struct vsp1_device *vsp1)
  */
 int vsp1_device_get(struct vsp1_device *vsp1)
 {
-       int ret;
-
-       ret = pm_runtime_get_sync(vsp1->dev);
-       if (ret < 0) {
-               pm_runtime_put_noidle(vsp1->dev);
-               return ret;
-       }
-
-       return 0;
+       return pm_runtime_resume_and_get(vsp1->dev);
 }
 
 /*