Commit 59c5f924 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

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: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2894500d
...@@ -524,7 +524,7 @@ static int mask_test_and_clear(volatile u8 *ptr, u8 mask) ...@@ -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) static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port)
{ {
struct uart_icount *icount = &port->uart.icount; 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; unsigned ix;
int count; int count;
u8 st, ch, push, status, overrun; u8 st, ch, push, status, overrun;
...@@ -534,10 +534,10 @@ static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port) ...@@ -534,10 +534,10 @@ static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port)
push = 0; push = 0;
count = CIRC_CNT(port->rx_inp, port->rx_outp, MNSC_BUFFER_SIZE); 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 (count == 0) {
if (!port->low_latency) if (!tport->low_latency)
tty_flip_buffer_push(port); tty_flip_buffer_push(tport);
return; return;
} }
...@@ -545,8 +545,8 @@ static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port) ...@@ -545,8 +545,8 @@ static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port)
/* pull chars out of the hat */ /* pull chars out of the hat */
ix = ACCESS_ONCE(port->rx_outp); ix = ACCESS_ONCE(port->rx_outp);
if (CIRC_CNT(port->rx_inp, ix, MNSC_BUFFER_SIZE) == 0) { if (CIRC_CNT(port->rx_inp, ix, MNSC_BUFFER_SIZE) == 0) {
if (push && !port->low_latency) if (push && !tport->low_latency)
tty_flip_buffer_push(port); tty_flip_buffer_push(tport);
return; return;
} }
...@@ -666,19 +666,19 @@ static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port) ...@@ -666,19 +666,19 @@ static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port)
else else
flag = TTY_NORMAL; 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 /* overrun is special, since it's reported immediately, and doesn't
* affect the current character * affect the current character
*/ */
if (overrun) if (overrun)
tty_insert_flip_char(port, 0, TTY_OVERRUN); tty_insert_flip_char(tport, 0, TTY_OVERRUN);
count--; count--;
if (count <= 0) { if (count <= 0) {
if (!port->low_latency) if (!tport->low_latency)
tty_flip_buffer_push(port); tty_flip_buffer_push(tport);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment