diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-05-14 18:32:48 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-14 22:06:50 +0400 |
| commit | 152a3a7320d1582009db85d8be365ce430d079af (patch) | |
| tree | 4ce91bc49ef493ce0299dd43c09f725b04ec567d /include/media | |
| parent | 47bd4bc1a2624939c9f4ba154a2c18abe9d6c614 (diff) | |
| download | linux-152a3a7320d1582009db85d8be365ce430d079af.tar.xz | |
[media] v4l2-dev: rename two functions
Rename the function v4l2_dont_use_lock to v4l2_disable_ioctl_locking,
and rename v4l2_dont_use_cmd to v4l2_disable_ioctl.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/v4l2-dev.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index 70d91c99728b..a056e6ee1b68 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h @@ -132,7 +132,7 @@ struct video_device DECLARE_BITMAP(valid_ioctls, BASE_VIDIOC_PRIVATE); /* serialization lock */ - DECLARE_BITMAP(dont_use_lock, BASE_VIDIOC_PRIVATE); + DECLARE_BITMAP(disable_locking, BASE_VIDIOC_PRIVATE); struct mutex *lock; }; @@ -182,17 +182,17 @@ void video_device_release_empty(struct video_device *vdev); bool v4l2_is_known_ioctl(unsigned int cmd); /* mark that this command shouldn't use core locking */ -static inline void v4l2_dont_use_lock(struct video_device *vdev, unsigned int cmd) +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->dont_use_lock); + set_bit(_IOC_NR(cmd), vdev->disable_locking); } -/* Mark that this command isn't implemented, must be called before +/* Mark that this command isn't implemented. This must be called before video_device_register. See also the comments in determine_valid_ioctls(). This function allows drivers to provide just one v4l2_ioctl_ops struct, but disable ioctls based on the specific card that is actually found. */ -static inline void v4l2_dont_use_cmd(struct video_device *vdev, unsigned int cmd) +static inline void v4l2_disable_ioctl(struct video_device *vdev, unsigned int cmd) { if (_IOC_NR(cmd) < BASE_VIDIOC_PRIVATE) set_bit(_IOC_NR(cmd), vdev->valid_ioctls); |