summaryrefslogtreecommitdiffstats
path: root/drivers/serial/amba-pl011.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-04-26 15:29:44 +0100
committerRussell King <rmk@dyn-67.arm.linux.org.uk>2005-04-26 15:29:44 +0100
commit45849282bfd7543253761cbf7db96151b05e5ed1 (patch)
tree1e02a8874f487041795f27427d2ee22e8c236c8c /drivers/serial/amba-pl011.c
parentb453257f057b834fdf9f4a6ad6133598b79bd982 (diff)
downloadop-kernel-dev-45849282bfd7543253761cbf7db96151b05e5ed1.zip
op-kernel-dev-45849282bfd7543253761cbf7db96151b05e5ed1.tar.gz
[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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index ff658a8..d5cbef3 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)
* out of the main execution path
*/
rsr = readw(uap->port.membase + UART01x_RSR) | UART_DUMMY_RSR_RX;
- if (rsr & UART01x_RSR_ANY) {
+ if (unlikely(rsr & UART01x_RSR_ANY)) {
if (rsr & UART01x_RSR_BE) {
rsr &= ~(UART01x_RSR_FE | UART01x_RSR_PE);
uap->port.icount.brk++;
OpenPOWER on IntegriCloud