Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ef3b49c authored by Arnaud Giersch's avatar Arnaud Giersch Committed by Linus Torvalds
Browse files

[PATCH] parport: fix documentation 



Fix documentation to actually match the code.

Signed-off-by: default avatarArnaud Giersch <arnaud.giersch@free.fr>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 88fc3897

Documentation/parport-lowlevel.txt

+4 −4
Original line number Diff line number Diff line
@@ -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);

	...

};
@@ -1097,7 +1097,7 @@ SYNOPSIS 


struct parport_operations {

	...

	void (*frob_control) (struct parport *port,

	unsigned char (*frob_control) (struct parport *port,

				       unsigned char mask,

				       unsigned char val);

	...

drivers/parport/ieee1284.c

+5 −5
Original line number Diff line number Diff line
@@ -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)
@@ -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.