diff options
| author | Hans Verkuil | 2018-10-04 22:48:12 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2018-11-20 19:54:23 +0100 |
| commit | ed3e2749ff4a94e35de653f9bbce407eb25ae363 (patch) | |
| tree | 00417b30db2247a7acfddb3e0f8f1cfc274ac81f /drivers/media/v4l2-core | |
| parent | media: s5p-g2d: convert g/s_crop to g/s_selection (diff) | |
| download | kernel-qcow2-linux-ed3e2749ff4a94e35de653f9bbce407eb25ae363.tar.gz kernel-qcow2-linux-ed3e2749ff4a94e35de653f9bbce407eb25ae363.tar.xz kernel-qcow2-linux-ed3e2749ff4a94e35de653f9bbce407eb25ae363.zip | |
media: v4l2-ioctl: remove unused vidioc_g/s_crop
Now that all drivers have dropped vidioc_g/s_crop we can remove
support for them in the V4L2 core.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Tested-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/v4l2-core')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-dev.c | 4 | ||||
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-ioctl.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c index feb749aaaa42..52700f4f797e 100644 --- a/drivers/media/v4l2-core/v4l2-dev.c +++ b/drivers/media/v4l2-core/v4l2-dev.c @@ -635,9 +635,9 @@ static void determine_valid_ioctls(struct video_device *vdev) SET_VALID_IOCTL(ops, VIDIOC_TRY_DECODER_CMD, vidioc_try_decoder_cmd); SET_VALID_IOCTL(ops, VIDIOC_ENUM_FRAMESIZES, vidioc_enum_framesizes); SET_VALID_IOCTL(ops, VIDIOC_ENUM_FRAMEINTERVALS, vidioc_enum_frameintervals); - if (ops->vidioc_g_crop || ops->vidioc_g_selection) + if (ops->vidioc_g_selection) set_bit(_IOC_NR(VIDIOC_G_CROP), valid_ioctls); - if (ops->vidioc_s_crop || ops->vidioc_s_selection) + if (ops->vidioc_s_selection) set_bit(_IOC_NR(VIDIOC_S_CROP), valid_ioctls); SET_VALID_IOCTL(ops, VIDIOC_G_SELECTION, vidioc_g_selection); SET_VALID_IOCTL(ops, VIDIOC_S_SELECTION, vidioc_s_selection); diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 47f4e1d767e4..0743d11a9646 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -2209,8 +2209,6 @@ static int v4l_g_crop(const struct v4l2_ioctl_ops *ops, }; int ret; - if (ops->vidioc_g_crop) - return ops->vidioc_g_crop(file, fh, p); /* simulate capture crop using selection api */ /* crop means compose for output devices */ @@ -2241,8 +2239,6 @@ static int v4l_s_crop(const struct v4l2_ioctl_ops *ops, .r = p->c, }; - if (ops->vidioc_s_crop) - return ops->vidioc_s_crop(file, fh, p); /* simulate capture crop using selection api */ /* crop means compose for output devices */ |