aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/video4linux/v4l2-framework.txt
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-05-14 10:32:48 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-14 14:06:50 -0400
commit152a3a7320d1582009db85d8be365ce430d079af (patch)
tree4ce91bc49ef493ce0299dd43c09f725b04ec567d /Documentation/video4linux/v4l2-framework.txt
parent47bd4bc1a2624939c9f4ba154a2c18abe9d6c614 (diff)
[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 'Documentation/video4linux/v4l2-framework.txt')
-rw-r--r--Documentation/video4linux/v4l2-framework.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt
index c24a9393dbb..1f590527005 100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
@@ -623,7 +623,7 @@ In some cases you want to tell the core that a function you had specified in
623your v4l2_ioctl_ops should be ignored. You can mark such ioctls by calling this 623your v4l2_ioctl_ops should be ignored. You can mark such ioctls by calling this
624function before video_device_register is called: 624function before video_device_register is called:
625 625
626void v4l2_dont_use_cmd(struct video_device *vdev, unsigned int cmd); 626void v4l2_disable_ioctl(struct video_device *vdev, unsigned int cmd);
627 627
628This tends to be needed if based on external factors (e.g. which card is 628This tends to be needed if based on external factors (e.g. which card is
629being used) you want to turns off certain features in v4l2_ioctl_ops without 629being used) you want to turns off certain features in v4l2_ioctl_ops without
@@ -655,9 +655,9 @@ will be either a top-level mutex or a mutex per device node. By default this
655lock will be used for unlocked_ioctl, but you can disable locking for 655lock will be used for unlocked_ioctl, but you can disable locking for
656selected ioctls by calling: 656selected ioctls by calling:
657 657
658 void v4l2_dont_use_lock(struct video_device *vdev, unsigned int cmd); 658 void v4l2_disable_ioctl_locking(struct video_device *vdev, unsigned int cmd);
659 659
660E.g.: v4l2_dont_use_lock(vdev, VIDIOC_DQBUF); 660E.g.: v4l2_disable_ioctl_locking(vdev, VIDIOC_DQBUF);
661 661
662You have to call this before you register the video_device. 662You have to call this before you register the video_device.
663 663