diff options
author | Lad, Prabhakar <prabhakar.csengg@gmail.com> | 2014-05-16 09:33:48 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-24 15:42:10 -0400 |
commit | 023047a369628339a85969e452b1ff4947dc6269 (patch) | |
tree | edc6613dc8e2bb201310c81026297ad967916d54 /drivers/media/platform | |
parent | ea06cc5d908cdbb50a836b55179247445b5a4d70 (diff) |
[media] media: davinci: vpif_capture: 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_capture.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index d452eaf59b91..c6b06019529f 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c | |||
@@ -1125,30 +1125,6 @@ static int vpif_querycap(struct file *file, void *priv, | |||
1125 | } | 1125 | } |
1126 | 1126 | ||
1127 | /** | 1127 | /** |
1128 | * vpif_cropcap() - cropcap handler | ||
1129 | * @file: file ptr | ||
1130 | * @priv: file handle | ||
1131 | * @crop: ptr to v4l2_cropcap structure | ||
1132 | */ | ||
1133 | static int vpif_cropcap(struct file *file, void *priv, | ||
1134 | struct v4l2_cropcap *crop) | ||
1135 | { | ||
1136 | struct video_device *vdev = video_devdata(file); | ||
1137 | struct channel_obj *ch = video_get_drvdata(vdev); | ||
1138 | struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX]; | ||
1139 | |||
1140 | if (V4L2_BUF_TYPE_VIDEO_CAPTURE != crop->type) | ||
1141 | return -EINVAL; | ||
1142 | |||
1143 | crop->bounds.left = 0; | ||
1144 | crop->bounds.top = 0; | ||
1145 | crop->bounds.height = common->height; | ||
1146 | crop->bounds.width = common->width; | ||
1147 | crop->defrect = crop->bounds; | ||
1148 | return 0; | ||
1149 | } | ||
1150 | |||
1151 | /** | ||
1152 | * vpif_enum_dv_timings() - ENUM_DV_TIMINGS handler | 1128 | * vpif_enum_dv_timings() - ENUM_DV_TIMINGS handler |
1153 | * @file: file ptr | 1129 | * @file: file ptr |
1154 | * @priv: file handle | 1130 | * @priv: file handle |
@@ -1333,7 +1309,6 @@ static const struct v4l2_ioctl_ops vpif_ioctl_ops = { | |||
1333 | .vidioc_s_std = vpif_s_std, | 1309 | .vidioc_s_std = vpif_s_std, |
1334 | .vidioc_g_std = vpif_g_std, | 1310 | .vidioc_g_std = vpif_g_std, |
1335 | 1311 | ||
1336 | .vidioc_cropcap = vpif_cropcap, | ||
1337 | .vidioc_enum_dv_timings = vpif_enum_dv_timings, | 1312 | .vidioc_enum_dv_timings = vpif_enum_dv_timings, |
1338 | .vidioc_query_dv_timings = vpif_query_dv_timings, | 1313 | .vidioc_query_dv_timings = vpif_query_dv_timings, |
1339 | .vidioc_s_dv_timings = vpif_s_dv_timings, | 1314 | .vidioc_s_dv_timings = vpif_s_dv_timings, |