aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2014-01-31 07:04:19 -0500
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-05-25 11:43:25 -0400
commit78dc47bb7897945abc7f63218196bce49c5020ea (patch)
tree17c00bd32a63abca4db0b036826a13fb1fb15f3e /drivers/media/platform
parent0eda185c6cd8ff47ffac172577fca9394073a4d6 (diff)
[media] s5p-tv: mixer: 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> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/s5p-tv/mixer_video.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
index 9f1e52f0bd09..8a8dbc8fdfde 100644
--- a/drivers/media/platform/s5p-tv/mixer_video.c
+++ b/drivers/media/platform/s5p-tv/mixer_video.c
@@ -509,9 +509,11 @@ static int mxr_enum_dv_timings(struct file *file, void *fh,
509 struct mxr_device *mdev = layer->mdev; 509 struct mxr_device *mdev = layer->mdev;
510 int ret; 510 int ret;
511 511
512 timings->pad = 0;
513
512 /* lock protects from changing sd_out */ 514 /* lock protects from changing sd_out */
513 mutex_lock(&mdev->mutex); 515 mutex_lock(&mdev->mutex);
514 ret = v4l2_subdev_call(to_outsd(mdev), video, enum_dv_timings, timings); 516 ret = v4l2_subdev_call(to_outsd(mdev), pad, enum_dv_timings, timings);
515 mutex_unlock(&mdev->mutex); 517 mutex_unlock(&mdev->mutex);
516 518
517 return ret ? -EINVAL : 0; 519 return ret ? -EINVAL : 0;
@@ -567,9 +569,11 @@ static int mxr_dv_timings_cap(struct file *file, void *fh,
567 struct mxr_device *mdev = layer->mdev; 569 struct mxr_device *mdev = layer->mdev;
568 int ret; 570 int ret;
569 571
572 cap->pad = 0;
573
570 /* lock protects from changing sd_out */ 574 /* lock protects from changing sd_out */
571 mutex_lock(&mdev->mutex); 575 mutex_lock(&mdev->mutex);
572 ret = v4l2_subdev_call(to_outsd(mdev), video, dv_timings_cap, cap); 576 ret = v4l2_subdev_call(to_outsd(mdev), pad, dv_timings_cap, cap);
573 mutex_unlock(&mdev->mutex); 577 mutex_unlock(&mdev->mutex);
574 578
575 return ret ? -EINVAL : 0; 579 return ret ? -EINVAL : 0;