media: rcar-vin: Merge helpers dealing with powering the parallel subdevice

The two power helpers are now only dealing with the parallel subdevice,
merge them into a single rvin_power_parallel() helper to reduce code
duplication.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
index c84962073cf6027faacf92433c4c510520096d09..5a01b617c87dccf1b97fb682e454daa559f3f3de 100644 (file)
--- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
+++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
@@ -749,23 +749,13 @@ static const struct v4l2_ioctl_ops rvin_mc_ioctl_ops = {
  * File Operations
  */
 
-static int rvin_power_on(struct rvin_dev *vin)
+static int rvin_power_parallel(struct rvin_dev *vin, bool on)
 {
-       int ret;
        struct v4l2_subdev *sd = vin_to_source(vin);
-
-       ret = v4l2_subdev_call(sd, core, s_power, 1);
-       if (ret < 0 && ret != -ENOIOCTLCMD && ret != -ENODEV)
-               return ret;
-       return 0;
-}
-
-static int rvin_power_off(struct rvin_dev *vin)
-{
+       int power = on ? 1 : 0;
        int ret;
-       struct v4l2_subdev *sd = vin_to_source(vin);
 
-       ret = v4l2_subdev_call(sd, core, s_power, 0);
+       ret = v4l2_subdev_call(sd, core, s_power, power);
        if (ret < 0 && ret != -ENOIOCTLCMD && ret != -ENODEV)
                return ret;
 
@@ -777,7 +767,7 @@ static int rvin_initialize_device(struct file *file)
        struct rvin_dev *vin = video_drvdata(file);
        int ret;
 
-       ret = rvin_power_on(vin);
+       ret = rvin_power_parallel(vin, true);
        if (ret < 0)
                return ret;
 
@@ -843,7 +833,7 @@ static int rvin_release(struct file *file)
         * Then de-initialize hw module.
         */
        if (fh_singular)
-               rvin_power_off(vin);
+               rvin_power_parallel(vin, false);
 
        mutex_unlock(&vin->lock);