mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
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>
This commit is contained in:
parent
8a7c5594c0
commit
0d5615d347
|
@ -2666,8 +2666,6 @@ struct mutex *v4l2_ioctl_get_lock(struct video_device *vdev, unsigned cmd)
|
|||
{
|
||||
if (_IOC_NR(cmd) >= V4L2_IOCTLS)
|
||||
return vdev->lock;
|
||||
if (test_bit(_IOC_NR(cmd), vdev->disable_locking))
|
||||
return NULL;
|
||||
if (vdev->queue && vdev->queue->lock &&
|
||||
(v4l2_ioctls[_IOC_NR(cmd)].flags & INFO_FL_QUEUE))
|
||||
return vdev->queue->lock;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue