Browse Source

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

Be sure that all VIDIOC_* ioctl are using the return error macro, and
aren't specifying generic error codes internally.

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Mauro Carvalho Chehab 14 years ago
parent
commit
43c1daa47d
35 changed files with 53 additions and 453 deletions
  1. 18 1
      Documentation/DocBook/media/v4l/gen-errors.xml
  2. 2 11
      Documentation/DocBook/media/v4l/vidioc-cropcap.xml
  3. 1 10
      Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml
  4. 0 17
      Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml
  5. 3 7
      Documentation/DocBook/media/v4l/vidioc-dqevent.xml
  6. 1 10
      Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml
  7. 0 11
      Documentation/DocBook/media/v4l/vidioc-enum-frameintervals.xml
  8. 0 11
      Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml
  9. 1 11
      Documentation/DocBook/media/v4l/vidioc-enumaudio.xml
  10. 1 11
      Documentation/DocBook/media/v4l/vidioc-enumaudioout.xml
  11. 1 17
      Documentation/DocBook/media/v4l/vidioc-g-audio.xml
  12. 1 17
      Documentation/DocBook/media/v4l/vidioc-g-audioout.xml
  13. 0 17
      Documentation/DocBook/media/v4l/vidioc-g-crop.xml
  14. 3 9
      Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml
  15. 3 8
      Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml
  16. 0 17
      Documentation/DocBook/media/v4l/vidioc-g-enc-index.xml
  17. 1 18
      Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml
  18. 2 18
      Documentation/DocBook/media/v4l/vidioc-g-fmt.xml
  19. 1 18
      Documentation/DocBook/media/v4l/vidioc-g-input.xml
  20. 0 17
      Documentation/DocBook/media/v4l/vidioc-g-jpegcomp.xml
  21. 1 17
      Documentation/DocBook/media/v4l/vidioc-g-output.xml
  22. 0 17
      Documentation/DocBook/media/v4l/vidioc-g-parm.xml
  23. 1 2
      Documentation/DocBook/media/v4l/vidioc-g-priority.xml
  24. 1 10
      Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml
  25. 1 8
      Documentation/DocBook/media/v4l/vidioc-g-std.xml
  26. 0 17
      Documentation/DocBook/media/v4l/vidioc-log-status.xml
  27. 1 10
      Documentation/DocBook/media/v4l/vidioc-overlay.xml
  28. 0 17
      Documentation/DocBook/media/v4l/vidioc-qbuf.xml
  29. 0 22
      Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml
  30. 0 19
      Documentation/DocBook/media/v4l/vidioc-querycap.xml
  31. 0 23
      Documentation/DocBook/media/v4l/vidioc-querystd.xml
  32. 0 16
      Documentation/DocBook/media/v4l/vidioc-reqbufs.xml
  33. 3 11
      Documentation/DocBook/media/v4l/vidioc-streamon.xml
  34. 3 0
      Documentation/DocBook/media/v4l/vidioc-subdev-g-fmt.xml
  35. 3 8
      Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml

+ 18 - 1
Documentation/DocBook/media/v4l/gen-errors.xml

@@ -10,7 +10,24 @@
 	<entry>The ioctl can't be handled because the device is busy. This is
 	<entry>The ioctl can't be handled because the device is busy. This is
 	       typically return while device is streaming, and an ioctl tried to
 	       typically return while device is streaming, and an ioctl tried to
 	       change something that would affect the stream, or would require the
 	       change something that would affect the stream, or would require the
-	       usage of a hardware resource that was already allocated.</entry>
+	       usage of a hardware resource that was already allocated. The ioctl
+	       must not be retried without performing another action to fix the
+	       problem first (typically: stop the stream before retrying).</entry>
+      </row>
+      <row>
+	<entry>EINVAL</entry>
+	<entry>The ioctl is not supported by the driver, actually meaning that
+	       the required functionality is not available.</entry>
+      </row>
+      <row>
+	<entry>ENOMEM</entry>
+	<entry>There's not enough memory to handle the desired operation.</entry>
+      </row>
+      <row>
+	<entry>ENOSPC</entry>
+	<entry>On USB devices, the stream ioctl's can return this error meaning
+	       that this request would overcommit the usb bandwidth reserved
+	       for periodic transfers (up to 80% of the USB bandwidth).</entry>
       </row>
       </row>
     </tbody>
     </tbody>
   </tgroup>
   </tgroup>

+ 2 - 11
Documentation/DocBook/media/v4l/vidioc-cropcap.xml

@@ -156,19 +156,10 @@ on 22 Oct 2002 subject "Re:[V4L][patches!] Re:v4l2/kernel-2.5" -->
 	<term><errorcode>EINVAL</errorcode></term>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	<listitem>
 	  <para>The &v4l2-cropcap; <structfield>type</structfield> is
 	  <para>The &v4l2-cropcap; <structfield>type</structfield> is
-invalid or the ioctl is not supported. This is not permitted for
-video capture, output and overlay devices, which must support
-<constant>VIDIOC_CROPCAP</constant>.</para>
+invalid. This is not permitted for video capture, output and overlay devices,
+which must support <constant>VIDIOC_CROPCAP</constant>.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 1 - 10
Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml

@@ -258,18 +258,9 @@ could not identify it.</entry>
       <varlistentry>
       <varlistentry>
 	<term><errorcode>EINVAL</errorcode></term>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	<listitem>
-	  <para>The driver does not support this ioctl, or the
-<structfield>match_type</structfield> is invalid.</para>
+	  <para>The <structfield>match_type</structfield> is invalid.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
      </variablelist>
      </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 0 - 17
Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml

@@ -246,15 +246,6 @@ register.</entry>
     &return-value;
     &return-value;
 
 
     <variablelist>
     <variablelist>
-      <varlistentry>
-	<term><errorcode>EINVAL</errorcode></term>
-	<listitem>
-	  <para>The driver does not support this ioctl, or the kernel
-was not compiled with the <constant>CONFIG_VIDEO_ADV_DEBUG</constant>
-option, or the <structfield>match_type</structfield> is invalid, or the
-selected chip or register does not exist.</para>
-	</listitem>
-      </varlistentry>
       <varlistentry>
       <varlistentry>
 	<term><errorcode>EPERM</errorcode></term>
 	<term><errorcode>EPERM</errorcode></term>
 	<listitem>
 	<listitem>
@@ -265,11 +256,3 @@ to execute these ioctls.</para>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 3 - 7
Documentation/DocBook/media/v4l/vidioc-dqevent.xml

@@ -136,11 +136,7 @@
     </table>
     </table>
 
 
   </refsect1>
   </refsect1>
+  <refsect1>
+    &return-value;
+  </refsect1>
 </refentry>
 </refentry>
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 1 - 10
Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml

@@ -180,8 +180,7 @@ Pictures</wordasword>, rather than immediately.</entry>
       <varlistentry>
       <varlistentry>
 	<term><errorcode>EINVAL</errorcode></term>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	<listitem>
-	  <para>The driver does not support this ioctl, or the
-<structfield>cmd</structfield> field is invalid.</para>
+	  <para>The <structfield>cmd</structfield> field is invalid.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
       <varlistentry>
       <varlistentry>
@@ -194,11 +193,3 @@ the encoder was not running.</para>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 0 - 11
Documentation/DocBook/media/v4l/vidioc-enum-frameintervals.xml

@@ -254,17 +254,6 @@ enumerated.</entry>
 
 
   <refsect1>
   <refsect1>
     &return-value;
     &return-value;
-
-    <para>See the description section above for a list of return
-values that <varname>errno</varname> can have.</para>
   </refsect1>
   </refsect1>
 
 
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 0 - 11
Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml

@@ -267,16 +267,5 @@ application should zero out all members except for the
 
 
   <refsect1>
   <refsect1>
     &return-value;
     &return-value;
-
-    <para>See the description section above for a list of return
-values that <varname>errno</varname> can have.</para>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 1 - 11
Documentation/DocBook/media/v4l/vidioc-enumaudio.xml

@@ -68,19 +68,9 @@ until the driver returns <errorcode>EINVAL</errorcode>.</para>
       <varlistentry>
       <varlistentry>
 	<term><errorcode>EINVAL</errorcode></term>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	<listitem>
-	  <para>The number of the audio input is out of bounds, or
-there are no audio inputs at all and this ioctl is not
-supported.</para>
+	  <para>The number of the audio input is out of bounds.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 1 - 11
Documentation/DocBook/media/v4l/vidioc-enumaudioout.xml

@@ -71,19 +71,9 @@ signal to a sound card are not audio outputs in this sense.</para>
       <varlistentry>
       <varlistentry>
 	<term><errorcode>EINVAL</errorcode></term>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	<listitem>
-	  <para>The number of the audio output is out of bounds, or
-there are no audio outputs at all and this ioctl is not
-supported.</para>
+	  <para>The number of the audio output is out of bounds.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 1 - 17
Documentation/DocBook/media/v4l/vidioc-g-audio.xml

@@ -164,25 +164,9 @@ tuner.</entry>
 	<listitem>
 	<listitem>
 	  <para>No audio inputs combine with the current video input,
 	  <para>No audio inputs combine with the current video input,
 or the number of the selected audio input is out of bounds or it does
 or the number of the selected audio input is out of bounds or it does
-not combine, or there are no audio inputs at all and the ioctl is not
-supported.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><errorcode>EBUSY</errorcode></term>
-	<listitem>
-	  <para>I/O is in progress, the input cannot be
-switched.</para>
+not combine.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 1 - 17
Documentation/DocBook/media/v4l/vidioc-g-audioout.xml

@@ -130,25 +130,9 @@ applications must set the array to zero.</entry>
 	<listitem>
 	<listitem>
 	  <para>No audio outputs combine with the current video
 	  <para>No audio outputs combine with the current video
 output, or the number of the selected audio output is out of bounds or
 output, or the number of the selected audio output is out of bounds or
-it does not combine, or there are no audio outputs at all and the
-ioctl is not supported.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><errorcode>EBUSY</errorcode></term>
-	<listitem>
-	  <para>I/O is in progress, the output cannot be
-switched.</para>
+it does not combine.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 0 - 17
Documentation/DocBook/media/v4l/vidioc-g-crop.xml

@@ -122,22 +122,5 @@ for &v4l2-cropcap; <structfield>bounds</structfield> is used.</entry>
 
 
   <refsect1>
   <refsect1>
     &return-value;
     &return-value;
-
-    <variablelist>
-      <varlistentry>
-	<term><errorcode>EINVAL</errorcode></term>
-	<listitem>
-	  <para>Cropping is not supported.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 3 - 9
Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml

@@ -97,14 +97,8 @@ If the preset is not supported, it returns an &EINVAL; </para>
 	</tbody>
 	</tbody>
       </tgroup>
       </tgroup>
     </table>
     </table>
-
+  </refsect1>
+  <refsect1>
+    &return-value;
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 3 - 8
Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml

@@ -212,12 +212,7 @@ bit 0 (V4L2_DV_VSYNC_POS_POL) is for vertical sync polarity and bit 1 (V4L2_DV_H
       </tgroup>
       </tgroup>
     </table>
     </table>
   </refsect1>
   </refsect1>
+  <refsect1>
+    &return-value;
+  </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 0 - 17
Documentation/DocBook/media/v4l/vidioc-g-enc-index.xml

@@ -192,22 +192,5 @@ this mask to obtain the picture coding type.</entry>
 
 
   <refsect1>
   <refsect1>
     &return-value;
     &return-value;
-
-    <variablelist>
-      <varlistentry>
-	<term><errorcode>EINVAL</errorcode></term>
-	<listitem>
-	  <para>The driver does not support this ioctl.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 1 - 18
Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml

@@ -445,29 +445,12 @@ by a privileged user to negotiate the parameters for a destructive
 overlay.</para>
 overlay.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
-      <varlistentry>
-	<term><errorcode>EBUSY</errorcode></term>
-	<listitem>
-	  <para>The framebuffer parameters cannot be changed at this
-time because overlay is already enabled, or capturing is enabled
-and the hardware cannot capture and overlay simultaneously.</para>
-	</listitem>
-      </varlistentry>
       <varlistentry>
       <varlistentry>
 	<term><errorcode>EINVAL</errorcode></term>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	<listitem>
-	  <para>The ioctl is not supported or the
-<constant>VIDIOC_S_FBUF</constant> parameters are unsuitable.</para>
+	  <para>The <constant>VIDIOC_S_FBUF</constant> parameters are unsuitable.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 2 - 18
Documentation/DocBook/media/v4l/vidioc-g-fmt.xml

@@ -183,30 +183,14 @@ capture and output devices.</entry>
     &return-value;
     &return-value;
 
 
     <variablelist>
     <variablelist>
-      <varlistentry>
-	<term><errorcode>EBUSY</errorcode></term>
-	<listitem>
-	  <para>The data format cannot be changed at this
-time, for example because I/O is already in progress.</para>
-	</listitem>
-      </varlistentry>
       <varlistentry>
       <varlistentry>
 	<term><errorcode>EINVAL</errorcode></term>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	<listitem>
 	  <para>The &v4l2-format; <structfield>type</structfield>
 	  <para>The &v4l2-format; <structfield>type</structfield>
-field is invalid, the requested buffer type not supported, or
-<constant>VIDIOC_TRY_FMT</constant> was called and is not
-supported with this buffer type.</para>
+field is invalid, the requested buffer type not supported, or the
+format is not supported with this buffer type.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 1 - 18
Documentation/DocBook/media/v4l/vidioc-g-input.xml

@@ -75,26 +75,9 @@ querying or negotiating any other parameters.</para>
       <varlistentry>
       <varlistentry>
 	<term><errorcode>EINVAL</errorcode></term>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	<listitem>
-	  <para>The number of the video input is out of bounds, or
-there are no video inputs at all and this ioctl is not
-supported.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><errorcode>EBUSY</errorcode></term>
-	<listitem>
-	  <para>I/O is in progress, the input cannot be
-switched.</para>
+	  <para>The number of the video input is out of bounds.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 0 - 17
Documentation/DocBook/media/v4l/vidioc-g-jpegcomp.xml

@@ -159,22 +159,5 @@ to add them.</para>
 
 
   <refsect1>
   <refsect1>
     &return-value;
     &return-value;
-
-    <variablelist>
-      <varlistentry>
-	<term><errorcode>EINVAL</errorcode></term>
-	<listitem>
-	  <para>This ioctl is not supported.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 1 - 17
Documentation/DocBook/media/v4l/vidioc-g-output.xml

@@ -76,25 +76,9 @@ negotiating any other parameters.</para>
 	<term><errorcode>EINVAL</errorcode></term>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	<listitem>
 	  <para>The number of the video output is out of bounds, or
 	  <para>The number of the video output is out of bounds, or
-there are no video outputs at all and this ioctl is not
-supported.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><errorcode>EBUSY</errorcode></term>
-	<listitem>
-	  <para>I/O is in progress, the output cannot be
-switched.</para>
+there are no video outputs at all.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 0 - 17
Documentation/DocBook/media/v4l/vidioc-g-parm.xml

@@ -311,22 +311,5 @@ excessive motion blur. </para>
 
 
   <refsect1>
   <refsect1>
     &return-value;
     &return-value;
-
-    <variablelist>
-      <varlistentry>
-	<term><errorcode>EINVAL</errorcode></term>
-	<listitem>
-	  <para>This ioctl is not supported.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 1 - 2
Documentation/DocBook/media/v4l/vidioc-g-priority.xml

@@ -120,8 +120,7 @@ recording.</entry>
       <varlistentry>
       <varlistentry>
 	<term><errorcode>EINVAL</errorcode></term>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	<listitem>
-	  <para>The requested priority value is invalid, or the
-driver does not support access priorities.</para>
+	  <para>The requested priority value is invalid.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
       <varlistentry>
       <varlistentry>

+ 1 - 10
Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml

@@ -246,19 +246,10 @@ line systems.</entry>
       <varlistentry>
       <varlistentry>
 	<term><errorcode>EINVAL</errorcode></term>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	<listitem>
-	  <para>The device does not support sliced VBI capturing or
-output, or the value in the <structfield>type</structfield> field is
+	  <para>The value in the <structfield>type</structfield> field is
 wrong.</para>
 wrong.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 1 - 8
Documentation/DocBook/media/v4l/vidioc-g-std.xml

@@ -82,14 +82,7 @@ standards.</para>
       <varlistentry>
       <varlistentry>
 	<term><errorcode>EINVAL</errorcode></term>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	<listitem>
-	  <para>This ioctl is not supported, or the
-<constant>VIDIOC_S_STD</constant> parameter was unsuitable.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><errorcode>EBUSY</errorcode></term>
-	<listitem>
-	  <para>The device is busy and therefore can not change the standard</para>
+	  <para>The <constant>VIDIOC_S_STD</constant> parameter was unsuitable.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
     </variablelist>
     </variablelist>

+ 0 - 17
Documentation/DocBook/media/v4l/vidioc-log-status.xml

@@ -37,22 +37,5 @@ was introduced in Linux 2.6.15.</para>
 
 
   <refsect1>
   <refsect1>
     &return-value;
     &return-value;
-
-    <variablelist>
-      <varlistentry>
-	<term><errorcode>EINVAL</errorcode></term>
-	<listitem>
-	  <para>The driver does not support this ioctl.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 1 - 10
Documentation/DocBook/media/v4l/vidioc-overlay.xml

@@ -65,19 +65,10 @@
       <varlistentry>
       <varlistentry>
 	<term><errorcode>EINVAL</errorcode></term>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	<listitem>
-	  <para>Video overlay is not supported, or the
-parameters have not been set up. See <xref
+	  <para>The overlay parameters have not been set up. See <xref
 linkend="overlay" /> for the necessary steps.</para>
 linkend="overlay" /> for the necessary steps.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 0 - 17
Documentation/DocBook/media/v4l/vidioc-qbuf.xml

@@ -158,15 +158,6 @@ or no buffers have been allocated yet, or the
 <structfield>userptr</structfield> or
 <structfield>userptr</structfield> or
 <structfield>length</structfield> are invalid.</para>
 <structfield>length</structfield> are invalid.</para>
 	</listitem>
 	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><errorcode>ENOMEM</errorcode></term>
-	<listitem>
-	  <para>Not enough physical or virtual memory was available to
-enqueue a user pointer buffer.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
 	<term><errorcode>EIO</errorcode></term>
 	<term><errorcode>EIO</errorcode></term>
 	<listitem>
 	<listitem>
 	  <para><constant>VIDIOC_DQBUF</constant> failed due to an
 	  <para><constant>VIDIOC_DQBUF</constant> failed due to an
@@ -184,11 +175,3 @@ continue streaming.
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 0 - 22
Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml

@@ -61,27 +61,5 @@ returned.</para>
 
 
   <refsect1>
   <refsect1>
     &return-value;
     &return-value;
-    <variablelist>
-      <varlistentry>
-	<term><errorcode>EINVAL</errorcode></term>
-	<listitem>
-	  <para>This ioctl is not supported.</para>
-	</listitem>
-    </varlistentry>
-      <varlistentry>
-	<term><errorcode>EBUSY</errorcode></term>
-	<listitem>
-	  <para>The device is busy and therefore can not sense the preset</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 0 - 19
Documentation/DocBook/media/v4l/vidioc-querycap.xml

@@ -283,24 +283,5 @@ linkend="mmap">streaming</link> I/O method.</entry>
 
 
   <refsect1>
   <refsect1>
     &return-value;
     &return-value;
-
-    <variablelist>
-      <varlistentry>
-	<term><errorcode>EINVAL</errorcode></term>
-	<listitem>
-	  <para>The device is not compatible with this
-specification.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->
-

+ 0 - 23
Documentation/DocBook/media/v4l/vidioc-querystd.xml

@@ -62,28 +62,5 @@ current video input or output.</para>
 
 
   <refsect1>
   <refsect1>
     &return-value;
     &return-value;
-
-    <variablelist>
-      <varlistentry>
-	<term><errorcode>EINVAL</errorcode></term>
-	<listitem>
-	  <para>This ioctl is not supported.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><errorcode>EBUSY</errorcode></term>
-	<listitem>
-	  <para>The device is busy and therefore can not detect the standard</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 0 - 16
Documentation/DocBook/media/v4l/vidioc-reqbufs.xml

@@ -121,14 +121,6 @@ higher. This array should be zeroed by applications.</entry>
     &return-value;
     &return-value;
 
 
     <variablelist>
     <variablelist>
-      <varlistentry>
-	<term><errorcode>EBUSY</errorcode></term>
-	<listitem>
-	  <para>The driver supports multiple opens and I/O is already
-in progress, or reallocation of buffers was attempted although one or
-more are still mapped.</para>
-	</listitem>
-      </varlistentry>
       <varlistentry>
       <varlistentry>
 	<term><errorcode>EINVAL</errorcode></term>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	<listitem>
@@ -140,11 +132,3 @@ supported.</para>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 3 - 11
Documentation/DocBook/media/v4l/vidioc-streamon.xml

@@ -88,9 +88,9 @@ synchronize with other events.</para>
       <varlistentry>
       <varlistentry>
 	<term><errorcode>EINVAL</errorcode></term>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>
 	<listitem>
-	  <para>Streaming I/O is not supported, the buffer
-<structfield>type</structfield> is not supported, or no buffers have
-been allocated (memory mapping) or enqueued (output) yet.</para>
+	  <para>The buffer<structfield>type</structfield> is not supported,
+	  or no buffers have been allocated (memory mapping) or enqueued
+	  (output) yet.</para>
 	</listitem>
 	</listitem>
       </varlistentry>
       </varlistentry>
       <varlistentry>
       <varlistentry>
@@ -105,11 +105,3 @@ been allocated (memory mapping) or enqueued (output) yet.</para>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->

+ 3 - 0
Documentation/DocBook/media/v4l/vidioc-subdev-g-fmt.xml

@@ -177,4 +177,7 @@
       </varlistentry>
       </varlistentry>
     </variablelist>
     </variablelist>
   </refsect1>
   </refsect1>
+  <refsect1>
+    &return-value;
+  </refsect1>
 </refentry>
 </refentry>

+ 3 - 8
Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml

@@ -290,13 +290,8 @@
 	</tbody>
 	</tbody>
       </tgroup>
       </tgroup>
     </table>
     </table>
-
+  </refsect1>
+  <refsect1>
+    &return-value;
   </refsect1>
   </refsect1>
 </refentry>
 </refentry>
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: "v4l2.sgml"
-indent-tabs-mode: nil
-End:
--->