]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] media: davinci: vpif_capture: drop cropcap
authorLad, Prabhakar <prabhakar.csengg@gmail.com>
Fri, 16 May 2014 13:33:48 +0000 (10:33 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Sat, 24 May 2014 19:42:10 +0000 (16:42 -0300)
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>
drivers/media/platform/davinci/vpif_capture.c

index d452eaf59b91f513b5c3cdb30cf7df5da3e5adb2..c6b06019529f2c4842c63d7b75d2b49d27fa8490 100644 (file)
@@ -1124,30 +1124,6 @@ static int vpif_querycap(struct file *file, void  *priv,
        return 0;
 }
 
-/**
- * vpif_cropcap() - cropcap handler
- * @file: file ptr
- * @priv: file handle
- * @crop: ptr to v4l2_cropcap structure
- */
-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_CAPTURE != crop->type)
-               return -EINVAL;
-
-       crop->bounds.left = 0;
-       crop->bounds.top = 0;
-       crop->bounds.height = common->height;
-       crop->bounds.width = common->width;
-       crop->defrect = crop->bounds;
-       return 0;
-}
-
 /**
  * vpif_enum_dv_timings() - ENUM_DV_TIMINGS handler
  * @file: file ptr
@@ -1333,7 +1309,6 @@ static const struct v4l2_ioctl_ops vpif_ioctl_ops = {
        .vidioc_s_std                   = vpif_s_std,
        .vidioc_g_std                   = vpif_g_std,
 
-       .vidioc_cropcap                 = vpif_cropcap,
        .vidioc_enum_dv_timings         = vpif_enum_dv_timings,
        .vidioc_query_dv_timings        = vpif_query_dv_timings,
        .vidioc_s_dv_timings            = vpif_s_dv_timings,