Merge tag 'media/v4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-drm-fsl-dcu.git] / Documentation / DocBook / media / v4l / media-ioc-enum-links.xml

diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml
index 74fb394ec6676295fbf5e46813aa0bec2b4fa108..2bbeea9f3e18c80ad8206b1bfed3d37705188c78 100644 (file)
--- a/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml
@@ -118,35 +118,6 @@
       </tgroup>
     </table>
 
-    <table frame="none" pgwide="1" id="media-pad-flag">
-      <title>Media pad flags</title>
-      <tgroup cols="2">
-        <colspec colname="c1"/>
-        <colspec colname="c2"/>
-       <tbody valign="top">
-         <row>
-           <entry><constant>MEDIA_PAD_FL_SINK</constant></entry>
-           <entry>Input pad, relative to the entity. Input pads sink data and
-           are targets of links.</entry>
-         </row>
-         <row>
-           <entry><constant>MEDIA_PAD_FL_SOURCE</constant></entry>
-           <entry>Output pad, relative to the entity. Output pads source data
-           and are origins of links.</entry>
-         </row>
-         <row>
-           <entry><constant>MEDIA_PAD_FL_MUST_CONNECT</constant></entry>
-           <entry>If this flag is set and the pad is linked to any other
-           pad, then at least one of those links must be enabled for the
-           entity to be able to stream. There could be temporary reasons
-           (e.g. device configuration dependent) for the pad to need
-           enabled links even when this flag isn't set; the absence of the
-           flag doesn't imply there is none.</entry>
-         </row>
-       </tbody>
-      </tgroup>
-    </table>
-
     <table pgwide="1" frame="none" id="media-link-desc">
       <title>struct <structname>media_link_desc</structname></title>
       <tgroup cols="3">
@@ -171,33 +142,6 @@
       </tgroup>
     </table>
 
-    <table frame="none" pgwide="1" id="media-link-flag">
-      <title>Media link flags</title>
-      <tgroup cols="2">
-        <colspec colname="c1"/>
-        <colspec colname="c2"/>
-       <tbody valign="top">
-         <row>
-           <entry><constant>MEDIA_LNK_FL_ENABLED</constant></entry>
-           <entry>The link is enabled and can be used to transfer media data.
-           When two or more links target a sink pad, only one of them can be
-           enabled at a time.</entry>
-         </row>
-         <row>
-           <entry><constant>MEDIA_LNK_FL_IMMUTABLE</constant></entry>
-           <entry>The link enabled state can't be modified at runtime. An
-           immutable link is always enabled.</entry>
-         </row>
-         <row>
-           <entry><constant>MEDIA_LNK_FL_DYNAMIC</constant></entry>
-           <entry>The link enabled state can be modified during streaming. This
-           flag is set by drivers and is read-only for applications.</entry>
-         </row>
-       </tbody>
-      </tgroup>
-    </table>
-    <para>One and only one of <constant>MEDIA_PAD_FL_SINK</constant> and
-    <constant>MEDIA_PAD_FL_SOURCE</constant> must be set for every pad.</para>
   </refsect1>
 
   <refsect1>