summaryrefslogtreecommitdiff
path: root/Documentation/media/kapi/v4l2-dev.rst
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2016-08-19 18:00:43 +0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-08-23 03:23:00 +0300
commit1b81f010bfd8ce61b79329d7ebb23b62d5d7effb (patch)
tree253f5d219edd021f4f8be04ffabd2688ce7e8edf /Documentation/media/kapi/v4l2-dev.rst
parentb7ff94df5628326d4e204c97e782ecc0f3dfa8e3 (diff)
downloadlinux-1b81f010bfd8ce61b79329d7ebb23b62d5d7effb.tar.xz
[media] docs-next: stop abusing on the cpp domain
Now that we have an override for the c domain that will do the right thing for the Kernel, stop abusing on the cpp domain. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'Documentation/media/kapi/v4l2-dev.rst')
-rw-r--r--Documentation/media/kapi/v4l2-dev.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/media/kapi/v4l2-dev.rst b/Documentation/media/kapi/v4l2-dev.rst
index 429883b2f6ef..d07258a362d1 100644
--- a/Documentation/media/kapi/v4l2-dev.rst
+++ b/Documentation/media/kapi/v4l2-dev.rst
@@ -166,7 +166,7 @@ something.
In the case of :ref:`videobuf2 <vb2_framework>` you will need to implement the
``wait_prepare()`` and ``wait_finish()`` callbacks to unlock/lock if applicable.
If you use the ``queue->lock`` pointer, then you can use the helper functions
-:c:func:`vb2_ops_wait_prepare` and :cpp:func:`vb2_ops_wait_finish`.
+:c:func:`vb2_ops_wait_prepare` and :c:func:`vb2_ops_wait_finish`.
The implementation of a hotplug disconnect should also take the lock from
:c:type:`video_device` before calling v4l2_device_disconnect. If you are also
@@ -335,7 +335,7 @@ And this function:
returns the video_device belonging to the file struct.
-The :c:func:`video_devdata` function combines :cpp:func:`video_get_drvdata`
+The :c:func:`video_devdata` function combines :c:func:`video_get_drvdata`
with :c:func:`video_devdata`:
:c:func:`video_drvdata <video_drvdata>`