summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-05-30 11:07:05 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-07-30 10:23:34 -0400
commitea8532daee31bc72abfbc9ca7a43cbec0f6c05af (patch)
treed77df33036870942e996d8123b67577639973f0e
parent157eb9a0b75e97ad390c6e50c7381b0a0e02fe97 (diff)
downloadlinux-stable-ea8532daee31bc72abfbc9ca7a43cbec0f6c05af.tar.gz
linux-stable-ea8532daee31bc72abfbc9ca7a43cbec0f6c05af.tar.bz2
linux-stable-ea8532daee31bc72abfbc9ca7a43cbec0f6c05af.zip
media: videodev2: get rid of VIDIOC_RESERVED
While this ioctl is there at least since Kernel 2.6.12-rc2, it was never used by any upstream driver. Get rid of it. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--Documentation/media/videodev2.h.rst.exceptions1
-rw-r--r--include/uapi/linux/videodev2.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
index a5cb0a8686ac..ca9f0edc579e 100644
--- a/Documentation/media/videodev2.h.rst.exceptions
+++ b/Documentation/media/videodev2.h.rst.exceptions
@@ -517,7 +517,6 @@ ignore define V4L2_CTRL_WHICH_DEF_VAL
ignore define V4L2_OUT_CAP_CUSTOM_TIMINGS
ignore define V4L2_CID_MAX_CTRLS
-ignore ioctl VIDIOC_RESERVED
ignore define BASE_VIDIOC_PRIVATE
# Associate ioctls with their counterparts
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 3ea8097c2470..d8b33095abe0 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -2311,7 +2311,6 @@ struct v4l2_create_buffers {
*
*/
#define VIDIOC_QUERYCAP _IOR('V', 0, struct v4l2_capability)
-#define VIDIOC_RESERVED _IO('V', 1)
#define VIDIOC_ENUM_FMT _IOWR('V', 2, struct v4l2_fmtdesc)
#define VIDIOC_G_FMT _IOWR('V', 4, struct v4l2_format)
#define VIDIOC_S_FMT _IOWR('V', 5, struct v4l2_format)