adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix compile errors in SGI console drivers (linux-next tree)

Browse source 
Fix compile errors in SGI console drivers caused by changes to the
tty_port structures in the linux-next tree.

Signed-off-by: Jack Steiner <steiner@sgi.com>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jack Steiner 2008-07-16 21:54:31 +01:00 committed by Linus Torvalds
parent 87c25ef0a4
commit b1ca7e7a0b
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/serial/ioc3_serial.c
View file

@ -905,7 +905,7 @@ static void transmit_chars(struct uart_port *the_port)
return; return;
info = the_port->info; info = the_port->info;
tty = info->tty; tty = info->port.tty;
if (uart_circ_empty(&info->xmit) || uart_tx_stopped(the_port)) { if (uart_circ_empty(&info->xmit) || uart_tx_stopped(the_port)) {
/* Nothing to do or hw stopped */ /* Nothing to do or hw stopped */
@ -997,14 +997,14 @@ ioc3_change_speed(struct uart_port *the_port,
the_port->ignore_status_mask = N_ALL_INPUT; the_port->ignore_status_mask = N_ALL_INPUT;
info->tty->low_latency = 1; info->port.tty->low_latency = 1;
if (I_IGNPAR(info->tty)) if (I_IGNPAR(info->port.tty))
the_port->ignore_status_mask &= ~(N_PARITY_ERROR the_port->ignore_status_mask &= ~(N_PARITY_ERROR
| N_FRAMING_ERROR); | N_FRAMING_ERROR);
if (I_IGNBRK(info->tty)) { if (I_IGNBRK(info->port.tty)) {
the_port->ignore_status_mask &= ~N_BREAK; the_port->ignore_status_mask &= ~N_BREAK;
if (I_IGNPAR(info->tty)) if (I_IGNPAR(info->port.tty))
the_port->ignore_status_mask &= ~N_OVERRUN_ERROR; the_port->ignore_status_mask &= ~N_OVERRUN_ERROR;
} }
if (!(cflag & CREAD)) { if (!(cflag & CREAD)) {
@ -1399,14 +1399,14 @@ static int receive_chars(struct uart_port *the_port)
/* Make sure all the pointers are "good" ones */ /* Make sure all the pointers are "good" ones */
if (!info) if (!info)
return 0; return 0;
if (!info->tty) if (!info->port.tty)
return 0; return 0;
if (!(port->ip_flags & INPUT_ENABLE)) if (!(port->ip_flags & INPUT_ENABLE))
return 0; return 0;
spin_lock_irqsave(&the_port->lock, pflags); spin_lock_irqsave(&the_port->lock, pflags);
tty = info->tty; tty = info->port.tty;
read_count = do_read(the_port, ch, MAX_CHARS); read_count = do_read(the_port, ch, MAX_CHARS);
if (read_count > 0) { if (read_count > 0) {

2
drivers/serial/sn_console.c
View file

@ -471,7 +471,7 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
if (port->sc_port.info) { if (port->sc_port.info) {
/* The serial_core stuffs are initilized, use them */ /* The serial_core stuffs are initilized, use them */
tty = port->sc_port.info->tty; tty = port->sc_port.info->port.tty;
} }
else { else {
/* Not registered yet - can't pass to tty layer. */ /* Not registered yet - can't pass to tty layer. */