commit 45849282bfd7543253761cbf7db96151b05e5ed1
author Russell King <rmk@dyn-67.arm.linux.org.uk> Tue Apr 26 15:29:44 2005 +0100
committer Russell King <rmk@dyn-67.arm.linux.org.uk> Tue Apr 26 15:29:44 2005 +0100
tree 1e02a8874f487041795f27427d2ee22e8c236c8c
parent b453257f057b834fdf9f4a6ad6133598b79bd982

[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>

drivers/serial/21285.c

diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index f8504b0..33fbda7 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -110,7 +110,7 @@
 		port->icount.rx++;
 
 		rxs = *CSR_RXSTAT | RXSTAT_DUMMY_READ;
-		if (rxs & RXSTAT_ANYERR) {
+		if (unlikely(rxs & RXSTAT_ANYERR)) {
 			if (rxs & RXSTAT_PARITY)
 				port->icount.parity++;
 			else if (rxs & RXSTAT_FRAME)