Skip to content

Commit

Permalink
TTY: mn10300-serial, fix build breakage
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
Jiri Slaby authored and gregkh committed Jan 16, 2013
1 parent 2894500 commit 59c5f92
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions arch/mn10300/kernel/mn10300-serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -534,19 +534,19 @@ 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;
}

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;
}

Expand Down Expand Up @@ -666,19 +666,19 @@ static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port)
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;
}

Expand Down

0 comments on commit 59c5f92

Please sign in to comment.