diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-04-26 10:29:44 -0400 |
---|---|---|
committer | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-04-26 10:29:44 -0400 |
commit | 45849282bfd7543253761cbf7db96151b05e5ed1 (patch) | |
tree | 1e02a8874f487041795f27427d2ee22e8c236c8c /drivers/serial/amba-pl011.c | |
parent | b453257f057b834fdf9f4a6ad6133598b79bd982 (diff) |
[PATCH] Serial: Ensure error paths are marked with unlikely()
Ensure ARM serial driver error paths are marked with the
unlikely() compiler hint.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Diffstat (limited to 'drivers/serial/amba-pl011.c')
-rw-r--r-- | drivers/serial/amba-pl011.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index ff658a830f34..d5cbef3fe8b6 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c | |||
@@ -137,7 +137,7 @@ pl011_rx_chars(struct uart_amba_port *uap) | |||
137 | * out of the main execution path | 137 | * out of the main execution path |
138 | */ | 138 | */ |
139 | rsr = readw(uap->port.membase + UART01x_RSR) | UART_DUMMY_RSR_RX; | 139 | rsr = readw(uap->port.membase + UART01x_RSR) | UART_DUMMY_RSR_RX; |
140 | if (rsr & UART01x_RSR_ANY) { | 140 | if (unlikely(rsr & UART01x_RSR_ANY)) { |
141 | if (rsr & UART01x_RSR_BE) { | 141 | if (rsr & UART01x_RSR_BE) { |
142 | rsr &= ~(UART01x_RSR_FE | UART01x_RSR_PE); | 142 | rsr &= ~(UART01x_RSR_FE | UART01x_RSR_PE); |
143 | uap->port.icount.brk++; | 143 | uap->port.icount.brk++; |