From: Arnaud Giersch Fix documentation to actually match the code. Signed-off-by: Arnaud Giersch Signed-off-by: Andrew Morton --- Documentation/parport-lowlevel.txt | 8 ++++---- drivers/parport/ieee1284.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff -puN Documentation/parport-lowlevel.txt~parport-fix-documentation Documentation/parport-lowlevel.txt --- devel/Documentation/parport-lowlevel.txt~parport-fix-documentation 2006-01-22 23:20:39.000000000 -0800 +++ devel-akpm/Documentation/parport-lowlevel.txt 2006-01-22 23:20:39.000000000 -0800 @@ -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,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); ... }; diff -puN drivers/parport/ieee1284.c~parport-fix-documentation drivers/parport/ieee1284.c --- devel/drivers/parport/ieee1284.c~parport-fix-documentation 2006-01-22 23:20:39.000000000 -0800 +++ devel-akpm/drivers/parport/ieee1284.c 2006-01-22 23:20:39.000000000 -0800 @@ -61,10 +61,10 @@ static void timeout_waiting_on_port (uns * 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 * * * 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. _