summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2018-05-12 10:44:03 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-05-28 15:58:49 -0400
commit0d5615d3479fd165a4aca7f2dc3c418ffed3eb20 (patch)
treefadfd7f187f24c49a4c15350c500febc4edb897d /include/media
parent8a7c5594c02022ca5fa7fb603e11b3e1feb76ed5 (diff)
downloadop-kernel-dev-0d5615d3479fd165a4aca7f2dc3c418ffed3eb20.zip
op-kernel-dev-0d5615d3479fd165a4aca7f2dc3c418ffed3eb20.tar.gz
media: v4l2-ioctl: delete unused v4l2_disable_ioctl_locking
The last user of this 'feature' was the gspca driver. Now that that driver has been converted to vb2 we can delete this code. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-dev.h15
1 files changed, 0 insertions, 15 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 73073f6..30423ae 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -238,7 +238,6 @@ struct v4l2_file_operations {
* @ioctl_ops: pointer to &struct v4l2_ioctl_ops with ioctl callbacks
*
* @valid_ioctls: bitmap with the valid ioctls for this device
- * @disable_locking: bitmap with the ioctls that don't require locking
* @lock: pointer to &struct mutex serialization lock
*
* .. note::
@@ -291,7 +290,6 @@ struct video_device
const struct v4l2_ioctl_ops *ioctl_ops;
DECLARE_BITMAP(valid_ioctls, BASE_VIDIOC_PRIVATE);
- DECLARE_BITMAP(disable_locking, BASE_VIDIOC_PRIVATE);
struct mutex *lock;
};
@@ -446,19 +444,6 @@ void video_device_release_empty(struct video_device *vdev);
*/
bool v4l2_is_known_ioctl(unsigned int cmd);
-/** v4l2_disable_ioctl_locking - mark that a given command
- * shouldn't use core locking
- *
- * @vdev: pointer to &struct video_device
- * @cmd: ioctl command
- */
-static inline void v4l2_disable_ioctl_locking(struct video_device *vdev,
- unsigned int cmd)
-{
- if (_IOC_NR(cmd) < BASE_VIDIOC_PRIVATE)
- set_bit(_IOC_NR(cmd), vdev->disable_locking);
-}
-
/**
* v4l2_disable_ioctl- mark that a given command isn't implemented.
* shouldn't use core locking
OpenPOWER on IntegriCloud