Commit 2a9604b8 authored by Russell King's avatar Russell King

[PATCH] Serial: Move error path processing inline

With unlikely() there's no need for the error path to
use gotos.
Signed-off-by: default avatarRussell King <rmk@arm.linux.org.uk>
parent 45849282
...@@ -116,54 +116,43 @@ static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *re ...@@ -116,54 +116,43 @@ static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *re
* Note that the error handling code is * Note that the error handling code is
* out of the main execution path * out of the main execution path
*/ */
if (unlikely(ch & UART_ANY_ERR)) if (unlikely(ch & UART_ANY_ERR)) {
goto handle_error; if (ch & UARTDR_PARERR)
port->icount.parity++;
else if (ch & UARTDR_FRMERR)
port->icount.frame++;
if (ch & UARTDR_OVERR)
port->icount.overrun++;
if (uart_handle_sysrq_char(port, ch, regs)) ch &= port->read_status_mask;
goto ignore_char;
error_return: if (ch & UARTDR_PARERR)
tty_insert_flip_char(tty, ch, flg); flg = TTY_PARITY;
ignore_char: else if (ch & UARTDR_FRMERR)
status = clps_readl(SYSFLG(port)); flg = TTY_FRAME;
}
out:
tty_flip_buffer_push(tty);
return IRQ_HANDLED;
handle_error: #ifdef SUPPORT_SYSRQ
if (ch & UARTDR_PARERR) port->sysrq = 0;
port->icount.parity++; #endif
else if (ch & UARTDR_FRMERR) }
port->icount.frame++;
if (ch & UARTDR_OVERR)
port->icount.overrun++;
if (ch & port->ignore_status_mask) {
if (++ignored > 100)
goto out;
goto ignore_char;
}
ch &= port->read_status_mask;
if (ch & UARTDR_PARERR) if (uart_handle_sysrq_char(port, ch, regs))
flg = TTY_PARITY; goto ignore_char;
else if (ch & UARTDR_FRMERR)
flg = TTY_FRAME;
if (ch & UARTDR_OVERR) {
/* /*
* CHECK: does overrun affect the current character? * CHECK: does overrun affect the current character?
* ASSUMPTION: it does not. * ASSUMPTION: it does not.
*/ */
tty_insert_flip_char(tty, ch, flg); if ((ch & port->ignore_status_mask & ~RXSTAT_OVERRUN) == 0)
ch = 0; tty_insert_flip_char(tty, ch, flg);
flg = TTY_OVERRUN; if ((ch & ~port->ignore_status_mask & RXSTAT_OVERRUN) == 0)
tty_insert_flip_char(tty, 0, TTY_OVERRUN);
ignore_char:
status = clps_readl(SYSFLG(port));
} }
#ifdef SUPPORT_SYSRQ tty_flip_buffer_push(tty);
port->sysrq = 0; return IRQ_HANDLED;
#endif
goto error_return;
} }
static irqreturn_t clps711xuart_int_tx(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t clps711xuart_int_tx(int irq, void *dev_id, struct pt_regs *regs)
......
...@@ -214,56 +214,39 @@ sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs) ...@@ -214,56 +214,39 @@ sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs)
* note that the error handling code is * note that the error handling code is
* out of the main execution path * out of the main execution path
*/ */
if (status & UTSR1_TO_SM(UTSR1_PRE | UTSR1_FRE | UTSR1_ROR)) if (status & UTSR1_TO_SM(UTSR1_PRE | UTSR1_FRE | UTSR1_ROR)) {
goto handle_error; if (status & UTSR1_TO_SM(UTSR1_PRE))
sport->port.icount.parity++;
else if (status & UTSR1_TO_SM(UTSR1_FRE))
sport->port.icount.frame++;
if (status & UTSR1_TO_SM(UTSR1_ROR))
sport->port.icount.overrun++;
status &= sport->port.read_status_mask;
if (status & UTSR1_TO_SM(UTSR1_PRE))
flg = TTY_PARITY;
else if (status & UTSR1_TO_SM(UTSR1_FRE))
flg = TTY_FRAME;
#ifdef SUPPORT_SYSRQ
sport->port.sysrq = 0;
#endif
}
if (uart_handle_sysrq_char(&sport->port, ch, regs)) if (uart_handle_sysrq_char(&sport->port, ch, regs))
goto ignore_char; goto ignore_char;
error_return: if ((status & port->ignore_status_mask & ~UTSR1_TO_SM(UTSR1_ROR)) == 0)
tty_insert_flip_char(tty, ch, flg); tty_insert_flip_char(tty, ch, flg);
if (status & ~port->ignore_status_mask & UTSR1_TO_SM(UTSR1_ROR))
tty_insert_flip_char(tty, 0, TTY_OVERRUN);
ignore_char: ignore_char:
status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) | status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) |
UTSR0_TO_SM(UART_GET_UTSR0(sport)); UTSR0_TO_SM(UART_GET_UTSR0(sport));
} }
out:
tty_flip_buffer_push(tty); tty_flip_buffer_push(tty);
return;
handle_error:
if (status & UTSR1_TO_SM(UTSR1_PRE))
sport->port.icount.parity++;
else if (status & UTSR1_TO_SM(UTSR1_FRE))
sport->port.icount.frame++;
if (status & UTSR1_TO_SM(UTSR1_ROR))
sport->port.icount.overrun++;
if (status & sport->port.ignore_status_mask) {
if (++ignored > 100)
goto out;
goto ignore_char;
}
status &= sport->port.read_status_mask;
if (status & UTSR1_TO_SM(UTSR1_PRE))
flg = TTY_PARITY;
else if (status & UTSR1_TO_SM(UTSR1_FRE))
flg = TTY_FRAME;
if (status & UTSR1_TO_SM(UTSR1_ROR)) {
/*
* overrun does *not* affect the character
* we read from the FIFO
*/
tty_insert_flip_char(tty, ch, flg);
ch = 0;
flg = TTY_OVERRUN;
}
#ifdef SUPPORT_SYSRQ
sport->port.sysrq = 0;
#endif
goto error_return;
} }
static void sa1100_tx_chars(struct sa1100_port *sport) static void sa1100_tx_chars(struct sa1100_port *sport)
......
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