diff options
-rw-r--r-- | drivers/serial/21285.c | 2 | ||||
-rw-r--r-- | drivers/serial/amba-pl010.c | 2 | ||||
-rw-r--r-- | drivers/serial/amba-pl011.c | 2 | ||||
-rw-r--r-- | drivers/serial/clps711x.c | 2 | ||||
-rw-r--r-- | drivers/serial/s3c2410.c | 2 | ||||
-rw-r--r-- | drivers/serial/serial_lh7a40x.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c index f8504b0adebc..33fbda79f350 100644 --- a/drivers/serial/21285.c +++ b/drivers/serial/21285.c | |||
@@ -110,7 +110,7 @@ static irqreturn_t serial21285_rx_chars(int irq, void *dev_id, struct pt_regs *r | |||
110 | port->icount.rx++; | 110 | port->icount.rx++; |
111 | 111 | ||
112 | rxs = *CSR_RXSTAT | RXSTAT_DUMMY_READ; | 112 | rxs = *CSR_RXSTAT | RXSTAT_DUMMY_READ; |
113 | if (rxs & RXSTAT_ANYERR) { | 113 | if (unlikely(rxs & RXSTAT_ANYERR)) { |
114 | if (rxs & RXSTAT_PARITY) | 114 | if (rxs & RXSTAT_PARITY) |
115 | port->icount.parity++; | 115 | port->icount.parity++; |
116 | else if (rxs & RXSTAT_FRAME) | 116 | else if (rxs & RXSTAT_FRAME) |
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index 484f6fb900b5..f2a5e2933c47 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c | |||
@@ -172,7 +172,7 @@ pl010_rx_chars(struct uart_port *port) | |||
172 | * out of the main execution path | 172 | * out of the main execution path |
173 | */ | 173 | */ |
174 | rsr = UART_GET_RSR(port) | UART_DUMMY_RSR_RX; | 174 | rsr = UART_GET_RSR(port) | UART_DUMMY_RSR_RX; |
175 | if (rsr & UART01x_RSR_ANY) { | 175 | if (unlikely(rsr & UART01x_RSR_ANY)) { |
176 | if (rsr & UART01x_RSR_BE) { | 176 | if (rsr & UART01x_RSR_BE) { |
177 | rsr &= ~(UART01x_RSR_FE | UART01x_RSR_PE); | 177 | rsr &= ~(UART01x_RSR_FE | UART01x_RSR_PE); |
178 | port->icount.brk++; | 178 | port->icount.brk++; |
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++; |
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c index 16592fae47f3..e145e19b3fb5 100644 --- a/drivers/serial/clps711x.c +++ b/drivers/serial/clps711x.c | |||
@@ -116,7 +116,7 @@ static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *re | |||
116 | * Note that the error handling code is | 116 | * Note that the error handling code is |
117 | * out of the main execution path | 117 | * out of the main execution path |
118 | */ | 118 | */ |
119 | if (ch & UART_ANY_ERR) | 119 | if (unlikely(ch & UART_ANY_ERR)) |
120 | goto handle_error; | 120 | goto handle_error; |
121 | 121 | ||
122 | if (uart_handle_sysrq_char(port, ch, regs)) | 122 | if (uart_handle_sysrq_char(port, ch, regs)) |
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index bd6782aeb831..435750d40a47 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c | |||
@@ -364,7 +364,7 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id, struct pt_regs *regs) | |||
364 | flag = TTY_NORMAL; | 364 | flag = TTY_NORMAL; |
365 | port->icount.rx++; | 365 | port->icount.rx++; |
366 | 366 | ||
367 | if (uerstat & S3C2410_UERSTAT_ANY) { | 367 | if (unlikely(uerstat & S3C2410_UERSTAT_ANY)) { |
368 | dbg("rxerr: port ch=0x%02x, rxs=0x%08x\n", | 368 | dbg("rxerr: port ch=0x%02x, rxs=0x%08x\n", |
369 | ch, uerstat); | 369 | ch, uerstat); |
370 | 370 | ||
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c index 4ce3a41f1611..85cfa08d3bad 100644 --- a/drivers/serial/serial_lh7a40x.c +++ b/drivers/serial/serial_lh7a40x.c | |||
@@ -162,7 +162,7 @@ lh7a40xuart_rx_chars (struct uart_port* port) | |||
162 | flag = TTY_NORMAL; | 162 | flag = TTY_NORMAL; |
163 | ++port->icount.rx; | 163 | ++port->icount.rx; |
164 | 164 | ||
165 | if (data & RxError) { /* Quick check, short-circuit */ | 165 | if (unlikely(data & RxError)) { /* Quick check, short-circuit */ |
166 | if (data & RxBreak) { | 166 | if (data & RxBreak) { |
167 | data &= ~(RxFramingError | RxParityError); | 167 | data &= ~(RxFramingError | RxParityError); |
168 | ++port->icount.brk; | 168 | ++port->icount.brk; |