diff options
| author | Laurent Pinchart | 2014-01-31 09:04:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2014-05-25 12:42:56 -0300 |
| commit | 10d2146dbeeab165ae5b794cfc6be530c6458df2 (patch) | |
| tree | 0a160ed46c2d473b9760ba3072c11e5d2cbd60e4 | |
| parent | f1f8e4348d7d57977b8cd1c454420d9bb2717b72 (diff) | |
[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>
| -rw-r--r-- | drivers/media/platform/davinci/vpif_capture.c | 4 | ||||
| -rw-r--r-- | drivers/media/platform/davinci/vpif_display.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index f3d9d9cde98c..a7ed16497903 100644 --- 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 6513f5188f65..5bb085b19bcb 100644 --- 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; |