diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2013-01-16 14:45:07 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-16 07:36:47 -0800 |
| commit | 59c5f92427efa2bcf2a1ff6566027a5876d5dfa7 (patch) | |
| tree | a713d5441784a9777644a6df83f832e95dfe976b /arch/mn10300/kernel | |
| parent | 2894500dec707a3318e8c28a8df24d828af9a5e3 (diff) | |
| download | op-kernel-dev-59c5f92427efa2bcf2a1ff6566027a5876d5dfa7.zip op-kernel-dev-59c5f92427efa2bcf2a1ff6566027a5876d5dfa7.tar.gz | |
TTY: mn10300-serial, fix build breakage
By the recent `switch flipping' patches we introduced a build failure
in the driver:
mn10300-serial.c:527:19: error: 'port' redeclared as different kind of symbol
I did not notice because I did not even find a compiler for that new
architecture. Hopefully everything is all right now as I cannot test
it.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mn10300/kernel')
| -rw-r--r-- | arch/mn10300/kernel/mn10300-serial.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c index 1dd20db..bf6e949 100644 --- a/arch/mn10300/kernel/mn10300-serial.c +++ b/arch/mn10300/kernel/mn10300-serial.c @@ -524,7 +524,7 @@ static int mask_test_and_clear(volatile u8 *ptr, u8 mask) static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port) { struct uart_icount *icount = &port->uart.icount; - struct tty_port *port = &port->uart.state->port; + struct tty_port *tport = &port->uart.state->port; unsigned ix; int count; u8 st, ch, push, status, overrun; @@ -534,10 +534,10 @@ static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port) push = 0; count = CIRC_CNT(port->rx_inp, port->rx_outp, MNSC_BUFFER_SIZE); - count = tty_buffer_request_room(port, count); + count = tty_buffer_request_room(tport, count); if (count == 0) { - if (!port->low_latency) - tty_flip_buffer_push(port); + if (!tport->low_latency) + tty_flip_buffer_push(tport); return; } @@ -545,8 +545,8 @@ try_again: /* pull chars out of the hat */ ix = ACCESS_ONCE(port->rx_outp); if (CIRC_CNT(port->rx_inp, ix, MNSC_BUFFER_SIZE) == 0) { - if (push && !port->low_latency) - tty_flip_buffer_push(port); + if (push && !tport->low_latency) + tty_flip_buffer_push(tport); return; } @@ -666,19 +666,19 @@ insert: else flag = TTY_NORMAL; - tty_insert_flip_char(port, ch, flag); + tty_insert_flip_char(tport, ch, flag); } /* overrun is special, since it's reported immediately, and doesn't * affect the current character */ if (overrun) - tty_insert_flip_char(port, 0, TTY_OVERRUN); + tty_insert_flip_char(tport, 0, TTY_OVERRUN); count--; if (count <= 0) { - if (!port->low_latency) - tty_flip_buffer_push(port); + if (!tport->low_latency) + tty_flip_buffer_push(tport); return; } |
