upstream: [media] media: davinci: vpif: Switch to pad-level DV operations

The video-level enum_dv_timings and dv_timings_cap operations are
deprecated in favor of the pad-level versions. All subdev drivers
implement the pad-level versions, switch to them.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 4081285..3229755 100644 (file)
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -1172,7 +1172,9 @@ vpif_enum_dv_timings(struct file *file, void *priv,
        if (input.capabilities != V4L2_IN_CAP_DV_TIMINGS)
                return -ENODATA;
 
-       ret = v4l2_subdev_call(ch->sd, video, enum_dv_timings, timings);
+       timings->pad = 0;
+
+       ret = v4l2_subdev_call(ch->sd, pad, enum_dv_timings, timings);
        if (ret == -ENOIOCTLCMD || ret == -ENODEV)
                return -EINVAL;
 

diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 4784704..10b3124 100644 (file)
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -897,7 +897,9 @@ vpif_enum_dv_timings(struct file *file, void *priv,
        if (output.capabilities != V4L2_OUT_CAP_DV_TIMINGS)
                return -ENODATA;
 
-       ret = v4l2_subdev_call(ch->sd, video, enum_dv_timings, timings);
+       timings->pad = 0;
+
+       ret = v4l2_subdev_call(ch->sd, pad, enum_dv_timings, timings);
        if (ret == -ENOIOCTLCMD || ret == -ENODEV)
                return -EINVAL;
        return ret;