summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorLad, Prabhakar <prabhakar.csengg@gmail.com>2014-05-16 10:33:24 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-05-23 19:12:56 -0300
commit5f271f974f93f1118221588d72aa0ba63506c190 (patch)
tree7ccbef20c4ca29c116d63c3a127c8eb653825d26 /drivers/media/platform
parentd5b94b999e3a4aabf59cbf02cf289d49eeddb064 (diff)
downloadop-kernel-dev-5f271f974f93f1118221588d72aa0ba63506c190.zip
op-kernel-dev-5f271f974f93f1118221588d72aa0ba63506c190.tar.gz
[media] media: davinci: vpif_display: drop cropcap
this patch drops cropcap as this driver doesnt support cropping. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-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/davinci/vpif_display.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index fef03be..9848996 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -761,24 +761,6 @@ static int vpif_g_std(struct file *file, void *priv, v4l2_std_id *std)
return 0;
}
-static int vpif_cropcap(struct file *file, void *priv,
- struct v4l2_cropcap *crop)
-{
- struct video_device *vdev = video_devdata(file);
- struct channel_obj *ch = video_get_drvdata(vdev);
- struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
-
- if (V4L2_BUF_TYPE_VIDEO_OUTPUT != crop->type)
- return -EINVAL;
-
- crop->bounds.left = crop->bounds.top = 0;
- crop->defrect.left = crop->defrect.top = 0;
- crop->defrect.height = crop->bounds.height = common->height;
- crop->defrect.width = crop->bounds.width = common->width;
-
- return 0;
-}
-
static int vpif_enum_output(struct file *file, void *fh,
struct v4l2_output *output)
{
@@ -1070,7 +1052,6 @@ static const struct v4l2_ioctl_ops vpif_ioctl_ops = {
.vidioc_enum_output = vpif_enum_output,
.vidioc_s_output = vpif_s_output,
.vidioc_g_output = vpif_g_output,
- .vidioc_cropcap = vpif_cropcap,
.vidioc_enum_dv_timings = vpif_enum_dv_timings,
.vidioc_s_dv_timings = vpif_s_dv_timings,
.vidioc_g_dv_timings = vpif_g_dv_timings,
OpenPOWER on IntegriCloud