Skip to content

Commit

Permalink
[PATCH] parport: fix documentation
Browse files Browse the repository at this point in the history
Fix documentation to actually match the code.

Signed-off-by: Arnaud Giersch <arnaud.giersch@free.fr>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Arnaud Giersch authored and Linus Torvalds committed Feb 3, 2006
1 parent 88fc389 commit 0ef3b49
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions Documentation/parport-lowlevel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,7 @@ SYNOPSIS

struct parport_operations {
...
void (*write_status) (struct parport *port, unsigned char s);
void (*write_control) (struct parport *port, unsigned char s);
...
};

Expand Down Expand Up @@ -1097,9 +1097,9 @@ SYNOPSIS

struct parport_operations {
...
void (*frob_control) (struct parport *port,
unsigned char mask,
unsigned char val);
unsigned char (*frob_control) (struct parport *port,
unsigned char mask,
unsigned char val);
...
};

Expand Down
10 changes: 5 additions & 5 deletions drivers/parport/ieee1284.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ static void timeout_waiting_on_port (unsigned long cookie)
* set to zero, it returns immediately.
*
* If an interrupt occurs before the timeout period elapses, this
* function returns one immediately. If it times out, it returns
* a value greater than zero. An error code less than zero
* indicates an error (most likely a pending signal), and the
* calling code should finish what it's doing as soon as it can.
* function returns zero immediately. If it times out, it returns
* one. An error code less than zero indicates an error (most
* likely a pending signal), and the calling code should finish
* what it's doing as soon as it can.
*/

int parport_wait_event (struct parport *port, signed long timeout)
Expand Down Expand Up @@ -110,7 +110,7 @@ int parport_wait_event (struct parport *port, signed long timeout)
*
* If the status lines take on the desired values before the
* timeout period elapses, parport_poll_peripheral() returns zero
* immediately. A zero return value greater than zero indicates
* immediately. A return value greater than zero indicates
* a timeout. An error code (less than zero) indicates an error,
* most likely a signal that arrived, and the caller should
* finish what it is doing as soon as possible.
Expand Down

0 comments on commit 0ef3b49

Please sign in to comment.