media: i2c: tvp7002: Switch dv timing callbacks to pad ops

Change all (s|g|query)_dv_timings subdev callbacks to include
a pad argument.

Signed-off-by: Paweł Anikiel <panikiel@google.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil: align to open parenthesis]

diff --git a/drivers/media/i2c/tvp7002.c b/drivers/media/i2c/tvp7002.c
index 6a04ffae534325d83052775c2619227fbd530678..ea01bd86450e06ec64f1c6494b8f399fd19bad84 100644 (file)
--- a/drivers/media/i2c/tvp7002.c
+++ b/drivers/media/i2c/tvp7002.c
@@ -546,13 +546,16 @@ static int tvp7002_write_inittab(struct v4l2_subdev *sd,
        return error;
 }
 
-static int tvp7002_s_dv_timings(struct v4l2_subdev *sd,
-                                       struct v4l2_dv_timings *dv_timings)
+static int tvp7002_s_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
+                               struct v4l2_dv_timings *dv_timings)
 {
        struct tvp7002 *device = to_tvp7002(sd);
        const struct v4l2_bt_timings *bt = &dv_timings->bt;
        int i;
 
+       if (pad != 0)
+               return -EINVAL;
+
        if (dv_timings->type != V4L2_DV_BT_656_1120)
                return -EINVAL;
        for (i = 0; i < NUM_TIMINGS; i++) {
@@ -566,11 +569,14 @@ static int tvp7002_s_dv_timings(struct v4l2_subdev *sd,
        return -EINVAL;
 }
 
-static int tvp7002_g_dv_timings(struct v4l2_subdev *sd,
-                                       struct v4l2_dv_timings *dv_timings)
+static int tvp7002_g_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
+                               struct v4l2_dv_timings *dv_timings)
 {
        struct tvp7002 *device = to_tvp7002(sd);
 
+       if (pad != 0)
+               return -EINVAL;
+
        *dv_timings = device->current_timings->timings;
        return 0;
 }
@@ -659,12 +665,16 @@ static int tvp7002_query_dv(struct v4l2_subdev *sd, int *index)
        return 0;
 }
 
-static int tvp7002_query_dv_timings(struct v4l2_subdev *sd,
-                                       struct v4l2_dv_timings *timings)
+static int tvp7002_query_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
+                                   struct v4l2_dv_timings *timings)
 {
        int index;
-       int err = tvp7002_query_dv(sd, &index);
+       int err;
+
+       if (pad != 0)
+               return -EINVAL;
 
+       err = tvp7002_query_dv(sd, &index);
        if (err)
                return err;
        *timings = tvp7002_timings[index].timings;
@@ -861,9 +871,6 @@ static const struct v4l2_subdev_core_ops tvp7002_core_ops = {
 
 /* Specific video subsystem operation handlers */
 static const struct v4l2_subdev_video_ops tvp7002_video_ops = {
-       .g_dv_timings = tvp7002_g_dv_timings,
-       .s_dv_timings = tvp7002_s_dv_timings,
-       .query_dv_timings = tvp7002_query_dv_timings,
        .s_stream = tvp7002_s_stream,
 };
 
@@ -872,6 +879,9 @@ static const struct v4l2_subdev_pad_ops tvp7002_pad_ops = {
        .enum_mbus_code = tvp7002_enum_mbus_code,
        .get_fmt = tvp7002_get_pad_format,
        .set_fmt = tvp7002_set_pad_format,
+       .g_dv_timings = tvp7002_g_dv_timings,
+       .s_dv_timings = tvp7002_s_dv_timings,
+       .query_dv_timings = tvp7002_query_dv_timings,
        .enum_dv_timings = tvp7002_enum_dv_timings,
 };
 
@@ -1001,7 +1011,7 @@ static int tvp7002_probe(struct i2c_client *c)
 
        /* Set registers according to default video mode */
        timings = device->current_timings->timings;
-       error = tvp7002_s_dv_timings(sd, &timings);
+       error = tvp7002_s_dv_timings(sd, 0, &timings);
 
 #if defined(CONFIG_MEDIA_CONTROLLER)
        device->pad.flags = MEDIA_PAD_FL_SOURCE;