]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: rcar-vin: Do not call pm_runtime_{resume,suspend}()
authorNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Wed, 12 Jun 2019 23:45:40 +0000 (19:45 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Fri, 21 Jun 2019 20:39:30 +0000 (16:39 -0400)
The driver does not implement runtime resume and suspend function so
there is little point in trying to call them. This is a leftover from
the drivers soc_camera beginnings.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/platform/rcar-vin/rcar-v4l2.c

index 7cbdcbf9b090c6380c458e639ffd2e87e2f8cca9..b821ea01786eb1ffdad5e6727c04e12be7b80f07 100644 (file)
@@ -798,9 +798,6 @@ static int rvin_initialize_device(struct file *file)
                return ret;
 
        pm_runtime_enable(&vin->vdev.dev);
-       ret = pm_runtime_resume(&vin->vdev.dev);
-       if (ret < 0 && ret != -ENOSYS)
-               goto eresume;
 
        /*
         * Try to configure with default parameters. Notice: this is the
@@ -817,7 +814,6 @@ static int rvin_initialize_device(struct file *file)
        return 0;
 esfmt:
        pm_runtime_disable(&vin->vdev.dev);
-eresume:
        rvin_power_off(vin);
 
        return ret;
@@ -868,7 +864,6 @@ static int rvin_release(struct file *file)
         * Then de-initialize hw module.
         */
        if (fh_singular) {
-               pm_runtime_suspend(&vin->vdev.dev);
                pm_runtime_disable(&vin->vdev.dev);
                rvin_power_off(vin);
        }