Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[cascardo/linux.git] / Documentation / media / uapi / mediactl / media-ioc-g-topology.rst

diff --git a/Documentation/media/uapi/mediactl/media-ioc-g-topology.rst b/Documentation/media/uapi/mediactl/media-ioc-g-topology.rst
index 750dd11..48c9531 100644 (file)
--- a/Documentation/media/uapi/mediactl/media-ioc-g-topology.rst
+++ b/Documentation/media/uapi/mediactl/media-ioc-g-topology.rst
@@ -15,7 +15,8 @@ MEDIA_IOC_G_TOPOLOGY - Enumerate the graph topology and graph element properties
 Synopsis
 ========
 
-.. cpp:function:: int ioctl( int fd, int request, struct media_v2_topology *argp )
+.. c:function:: int ioctl( int fd, MEDIA_IOC_G_TOPOLOGY, struct media_v2_topology *argp )
+    :name: MEDIA_IOC_G_TOPOLOGY
 
 
 Arguments
@@ -24,9 +25,6 @@ Arguments
 ``fd``
     File descriptor returned by :ref:`open() <media-func-open>`.
 
-``request``
-    MEDIA_IOC_G_TOPOLOGY
-
 ``argp``
 
 
@@ -35,7 +33,7 @@ Description
 
 The typical usage of this ioctl is to call it twice. On the first call,
 the structure defined at struct
-:ref:`media_v2_topology <media-v2-topology>` should be zeroed. At
+:c:type:`media_v2_topology` should be zeroed. At
 return, if no errors happen, this ioctl will return the
 ``topology_version`` and the total number of entities, interfaces, pads
 and links.
@@ -48,11 +46,10 @@ other values untouched.
 If the ``topology_version`` remains the same, the ioctl should fill the
 desired arrays with the media graph elements.
 
-
-.. _media-v2-topology:
-
 .. tabularcolumns:: |p{1.6cm}|p{3.2cm}|p{12.7cm}|
 
+.. c:type:: media_v2_topology
+
 .. flat-table:: struct media_v2_topology
     :header-rows:  0
     :stub-columns: 0
@@ -144,11 +141,10 @@ desired arrays with the media graph elements.
          won't store the links. It will just update ``num_links``
 
 
-
-.. _media-v2-entity:
-
 .. tabularcolumns:: |p{1.6cm}|p{3.2cm}|p{12.7cm}|
 
+.. c:type:: media_v2_entity
+
 .. flat-table:: struct media_v2_entity
     :header-rows:  0
     :stub-columns: 0
@@ -189,11 +185,10 @@ desired arrays with the media graph elements.
          this array to zero.
 
 
-
-.. _media-v2-interface:
-
 .. tabularcolumns:: |p{1.6cm}|p{3.2cm}|p{12.7cm}|
 
+.. c:type:: media_v2_interface
+
 .. flat-table:: struct media_v2_interface
     :header-rows:  0
     :stub-columns: 0
@@ -239,14 +234,13 @@ desired arrays with the media graph elements.
        -  ``devnode``
 
        -  Used only for device node interfaces. See
-         :ref:`media-v2-intf-devnode` for details..
+         :c:type:`media_v2_intf_devnode` for details..
 
 
-
-.. _media-v2-intf-devnode:
-
 .. tabularcolumns:: |p{1.6cm}|p{3.2cm}|p{12.7cm}|
 
+.. c:type:: media_v2_intf_devnode
+
 .. flat-table:: struct media_v2_interface
     :header-rows:  0
     :stub-columns: 0
@@ -270,11 +264,10 @@ desired arrays with the media graph elements.
        -  Device node minor number.
 
 
-
-.. _media-v2-pad:
-
 .. tabularcolumns:: |p{1.6cm}|p{3.2cm}|p{12.7cm}|
 
+.. c:type:: media_v2_pad
+
 .. flat-table:: struct media_v2_pad
     :header-rows:  0
     :stub-columns: 0
@@ -315,11 +308,10 @@ desired arrays with the media graph elements.
          this array to zero.
 
 
-
-.. _media-v2-link:
-
 .. tabularcolumns:: |p{1.6cm}|p{3.2cm}|p{12.7cm}|
 
+.. c:type:: media_v2_link
+
 .. flat-table:: struct media_v2_pad
     :header-rows:  0
     :stub-columns: 0