[PATCH RFCv3 12/17] [media] DocBook/demux.xml: Remove generic errors

Mauro Carvalho Chehab
2011-07-06T18:04:28Z

Remove generic errors from ioctl() descriptions. For other ioctl's,
there's no generic section. So, just keep whatever is there.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/Documentation/DocBook/media/dvb/demux.xml b/Documentation/DocBook/media/dvb/demux.xml
index e5058d7..37c1790 100644
--- a/Documentation/DocBook/media/dvb/demux.xml
+++ b/Documentation/DocBook/media/dvb/demux.xml
@@ -552,13 +552,6 @@ typedef enum {
&return-value-dvb;
<informaltable><tgroup cols="2"> <row><entry
align="char">
- EBADF
-</entry><entry
- align="char">
- fd is not a valid file descriptor.
-</entry>
- </row><row><entry
- align="char">
EINVAL
</entry><entry
align="char">
@@ -615,14 +608,6 @@ typedef enum {
</entry>
</row> </tgroup></informaltable>
&return-value-dvb;
-<informaltable><tgroup cols="2"> <row><entry
- align="char">
- EBADF
-</entry><entry
- align="char">
- fd is not a valid file descriptor.
-</entry>
- </row> </tgroup></informaltable>



@@ -677,21 +662,6 @@ typedef enum {
</entry>
</row> </tgroup></informaltable>
&return-value-dvb;
-<informaltable><tgroup cols="2"> <row><entry
- align="char">
- EBADF
-</entry><entry
- align="char">
- fd is not a valid file descriptor.
-</entry>
- </row><row><entry
- align="char">
- EINVAL
-</entry><entry
- align="char">
- Invalid argument.
-</entry>
- </row> </tgroup></informaltable>



@@ -751,20 +721,6 @@ typedef enum {
&return-value-dvb;
<informaltable><tgroup cols="2"> <row><entry
align="char">
- EBADF
-</entry><entry
- align="char">
- fd is not a valid file descriptor.
-</entry>
- </row><row><entry
- align="char">
- EINVAL
-</entry><entry
- align="char">
- Invalid argument.
-</entry>
- </row><row><entry
- align="char">
EBUSY
</entry><entry
align="char">
@@ -820,22 +776,6 @@ typedef enum {
</entry>
</row> </tgroup></informaltable>
&return-value-dvb;
-<informaltable><tgroup cols="2"> <row><entry
- align="char">
- EBADF
-</entry><entry
- align="char">
- fd is not a valid file descriptor.
-</entry>
- </row><row><entry
- align="char">
- ENOMEM
-</entry><entry
- align="char">
- The driver was not able to allocate a buffer of the
- requested size.
-</entry>
- </row> </tgroup></informaltable>



@@ -894,20 +834,6 @@ typedef enum {
&return-value-dvb;
<informaltable><tgroup cols="2"> <row><entry
align="char">
- EBADF
-</entry><entry
- align="char">
- fd is not a valid file descriptor.
-</entry>
- </row><row><entry
- align="char">
- EFAULT
-</entry><entry
- align="char">
- ev points to an invalid address.
-</entry>
- </row><row><entry
- align="char">
EWOULDBLOCK
</entry><entry
align="char">
@@ -967,20 +893,6 @@ typedef enum {
&return-value-dvb;
<informaltable><tgroup cols="2"> <row><entry
align="char">
- EBADF
-</entry><entry
- align="char">
- fd is not a valid file descriptor.
-</entry>
- </row><row><entry
- align="char">
- EFAULT
-</entry><entry
- align="char">
- stc points to an invalid address.
-</entry>
- </row><row><entry
- align="char">
EINVAL
</entry><entry
align="char">
diff --git a/Documentation/DocBook/media/v4l/gen-errors.xml b/Documentation/DocBook/media/v4l/gen-errors.xml
index 9a9575f..3e6ddd9 100644
--- a/Documentation/DocBook/media/v4l/gen-errors.xml
+++ b/Documentation/DocBook/media/v4l/gen-errors.xml
@@ -48,6 +48,11 @@
that this request would overcommit the usb bandwidth reserved
for periodic transfers (up to 80% of the USB bandwidth).</entry>
</row>
+ <row>
+ <entry>EWOULDBLOCK</entry>
+ <entry>Operation would block. Used when the ioctl would need to wait
+ for an event, but the device was opened in non-blocking mode.</entry>
+ </row>

</tgroup>

--
1.7.1