OSDN Git Service

media: i2c: ccs-core: use pm_runtime_resume_and_get()
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Fri, 23 Apr 2021 15:19:11 +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.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/i2c/ccs/ccs-core.c

index 4a848ac..a349189 100644 (file)
@@ -3101,12 +3101,9 @@ static int __maybe_unused ccs_suspend(struct device *dev)
        bool streaming = sensor->streaming;
        int rval;
 
-       rval = pm_runtime_get_sync(dev);
-       if (rval < 0) {
-               pm_runtime_put_noidle(dev);
-
+       rval = pm_runtime_resume_and_get(dev);
+       if (rval < 0)
                return rval;
-       }
 
        if (sensor->streaming)
                ccs_stop_streaming(sensor);