aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/video4linux
diff options
context:
space:
mode:
authorRamakrishnan Muthukrishnan <ramakrmu@cisco.com>2014-06-19 13:23:00 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-04 15:16:11 -0400
commitff792c85e60727e66774eb3da8129298690eab0c (patch)
tree30f014456b195ec9d094df589159aa45c9c7c791 /Documentation/video4linux
parentdc3094a7135c2386d6ff465b13d008ea2262718d (diff)
[media] media: Documentation: remove V4L2_FL_USE_FH_PRIO flag
The V4L2_FL_USE_FH_PRIO has been removed from the code, now remove it from the documentation. Signed-off-by: Ramakrishnan Muthukrishnan <ramakrmu@cisco.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'Documentation/video4linux')
-rw-r--r--Documentation/video4linux/v4l2-framework.txt8
-rw-r--r--Documentation/video4linux/v4l2-pci-skeleton.c5
2 files changed, 1 insertions, 12 deletions
diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt
index 667a43361706..a11dff07ef71 100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
@@ -675,11 +675,6 @@ You should also set these fields:
675 video_device is initialized you *do* know which parent PCI device to use and 675 video_device is initialized you *do* know which parent PCI device to use and
676 so you set dev_device to the correct PCI device. 676 so you set dev_device to the correct PCI device.
677 677
678- flags: optional. Set to V4L2_FL_USE_FH_PRIO if you want to let the framework
679 handle the VIDIOC_G/S_PRIORITY ioctls. This requires that you use struct
680 v4l2_fh. Eventually this flag will disappear once all drivers use the core
681 priority handling. But for now it has to be set explicitly.
682
683If you use v4l2_ioctl_ops, then you should set .unlocked_ioctl to video_ioctl2 678If you use v4l2_ioctl_ops, then you should set .unlocked_ioctl to video_ioctl2
684in your v4l2_file_operations struct. 679in your v4l2_file_operations struct.
685 680
@@ -909,8 +904,7 @@ struct v4l2_fh
909 904
910struct v4l2_fh provides a way to easily keep file handle specific data 905struct v4l2_fh provides a way to easily keep file handle specific data
911that is used by the V4L2 framework. New drivers must use struct v4l2_fh 906that is used by the V4L2 framework. New drivers must use struct v4l2_fh
912since it is also used to implement priority handling (VIDIOC_G/S_PRIORITY) 907since it is also used to implement priority handling (VIDIOC_G/S_PRIORITY).
913if the video_device flag V4L2_FL_USE_FH_PRIO is also set.
914 908
915The users of v4l2_fh (in the V4L2 framework, not the driver) know 909The users of v4l2_fh (in the V4L2 framework, not the driver) know
916whether a driver uses v4l2_fh as its file->private_data pointer by 910whether a driver uses v4l2_fh as its file->private_data pointer by
diff --git a/Documentation/video4linux/v4l2-pci-skeleton.c b/Documentation/video4linux/v4l2-pci-skeleton.c
index 46904fe49609..006721e43b2a 100644
--- a/Documentation/video4linux/v4l2-pci-skeleton.c
+++ b/Documentation/video4linux/v4l2-pci-skeleton.c
@@ -883,11 +883,6 @@ static int skeleton_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
883 vdev->v4l2_dev = &skel->v4l2_dev; 883 vdev->v4l2_dev = &skel->v4l2_dev;
884 /* Supported SDTV standards, if any */ 884 /* Supported SDTV standards, if any */
885 vdev->tvnorms = SKEL_TVNORMS; 885 vdev->tvnorms = SKEL_TVNORMS;
886 /* If this bit is set, then the v4l2 core will provide the support
887 * for the VIDIOC_G/S_PRIORITY ioctls. This flag will eventually
888 * go away once all drivers have been converted to use struct v4l2_fh.
889 */
890 set_bit(V4L2_FL_USE_FH_PRIO, &vdev->flags);
891 video_set_drvdata(vdev, skel); 886 video_set_drvdata(vdev, skel);
892 887
893 ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1); 888 ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);