summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-12-23 16:17:23 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-02 20:10:56 +0100
commitdfa9a5ae679ff2d23caa995d0f55a19abaf0596e (patch)
tree4cfa951fd0dcc281881b5499f4ecdca29ea22de1
parentV4L/DVB (10133): v4l2-framework: use correct comment style. (diff)
downloadlinux-dfa9a5ae679ff2d23caa995d0f55a19abaf0596e.tar.xz
linux-dfa9a5ae679ff2d23caa995d0f55a19abaf0596e.zip
V4L/DVB (10134): v4l2 doc: set v4l2_dev instead of parent.
Update the documentation now that the v4l2_dev field is in. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/video4linux/v4l2-framework.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt
index ba9344294d6f..38d054aa0e0f 100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
@@ -390,8 +390,7 @@ allocated memory.
You should also set these fields:
-- parent: set to the parent device (same device as was used to register
- v4l2_device).
+- v4l2_dev: set to the v4l2_device parent device.
- name: set to something descriptive and unique.
- fops: set to the file_operations struct.
- ioctl_ops: if you use the v4l2_ioctl_ops to simplify ioctl maintenance
@@ -516,5 +515,4 @@ void *video_drvdata(struct file *file);
You can go from a video_device struct to the v4l2_device struct using:
-struct v4l2_device *v4l2_dev = dev_get_drvdata(vdev->parent);
-
+struct v4l2_device *v4l2_dev = vdev->v4l2_dev;