patch-2.1.49 linux/drivers/char/serial.c

Next file: linux/drivers/char/vt.c
Previous file: linux/drivers/char/misc.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.48/linux/drivers/char/serial.c linux/drivers/char/serial.c
@@ -3503,7 +3503,7 @@
  * Print a string to the serial port trying not to disturb any possible
  * real use of the port...
  */
-static int serial_console_write(const char *s, unsigned count)
+static void serial_console_write(const char *s, unsigned count)
 {
 	struct serial_state *ser;
 	int ier;
@@ -3538,14 +3538,12 @@
 	 */
 	wait_for_xmitr(ser);
 	outb(ier, ser->port + UART_IER);
-
-	return (0);
 }
 
 /*
  * Receive character from the serial port
  */
-static int serial_console_wait_key(void)
+static void serial_console_wait_key(void)
 {
 	struct serial_state *ser;
 	int ier;
@@ -3569,8 +3567,6 @@
 
 	/* Restore the interrupts */
 	outb(ier, ser->port + UART_IER);
-
-	return c;
 }
 
 static int serial_console_device(void)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov