aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/8250.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/serial/8250.c')
-rw-r--r--drivers/serial/8250.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index cc2a205d4230..e34bd03cfce7 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1175,7 +1175,7 @@ static void serial8250_enable_ms(struct uart_port *port)
1175} 1175}
1176 1176
1177static void 1177static void
1178receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs) 1178receive_chars(struct uart_8250_port *up, int *status)
1179{ 1179{
1180 struct tty_struct *tty = up->port.info->tty; 1180 struct tty_struct *tty = up->port.info->tty;
1181 unsigned char ch, lsr = *status; 1181 unsigned char ch, lsr = *status;
@@ -1233,7 +1233,7 @@ receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
1233 else if (lsr & UART_LSR_FE) 1233 else if (lsr & UART_LSR_FE)
1234 flag = TTY_FRAME; 1234 flag = TTY_FRAME;
1235 } 1235 }
1236 if (uart_handle_sysrq_char(&up->port, ch, regs)) 1236 if (uart_handle_sysrq_char(&up->port, ch))
1237 goto ignore_char; 1237 goto ignore_char;
1238 1238
1239 uart_insert_char(&up->port, lsr, UART_LSR_OE, ch, flag); 1239 uart_insert_char(&up->port, lsr, UART_LSR_OE, ch, flag);
@@ -1309,7 +1309,7 @@ static unsigned int check_modem_status(struct uart_8250_port *up)
1309 * This handles the interrupt from one port. 1309 * This handles the interrupt from one port.
1310 */ 1310 */
1311static inline void 1311static inline void
1312serial8250_handle_port(struct uart_8250_port *up, struct pt_regs *regs) 1312serial8250_handle_port(struct uart_8250_port *up)
1313{ 1313{
1314 unsigned int status; 1314 unsigned int status;
1315 1315
@@ -1320,7 +1320,7 @@ serial8250_handle_port(struct uart_8250_port *up, struct pt_regs *regs)
1320 DEBUG_INTR("status = %x...", status); 1320 DEBUG_INTR("status = %x...", status);
1321 1321
1322 if (status & UART_LSR_DR) 1322 if (status & UART_LSR_DR)
1323 receive_chars(up, &status, regs); 1323 receive_chars(up, &status);
1324 check_modem_status(up); 1324 check_modem_status(up);
1325 if (status & UART_LSR_THRE) 1325 if (status & UART_LSR_THRE)
1326 transmit_chars(up); 1326 transmit_chars(up);
@@ -1342,7 +1342,7 @@ serial8250_handle_port(struct uart_8250_port *up, struct pt_regs *regs)
1342 * This means we need to loop through all ports. checking that they 1342 * This means we need to loop through all ports. checking that they
1343 * don't have an interrupt pending. 1343 * don't have an interrupt pending.
1344 */ 1344 */
1345static irqreturn_t serial8250_interrupt(int irq, void *dev_id, struct pt_regs *regs) 1345static irqreturn_t serial8250_interrupt(int irq, void *dev_id)
1346{ 1346{
1347 struct irq_info *i = dev_id; 1347 struct irq_info *i = dev_id;
1348 struct list_head *l, *end = NULL; 1348 struct list_head *l, *end = NULL;
@@ -1361,7 +1361,7 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id, struct pt_regs *r
1361 1361
1362 iir = serial_in(up, UART_IIR); 1362 iir = serial_in(up, UART_IIR);
1363 if (!(iir & UART_IIR_NO_INT)) { 1363 if (!(iir & UART_IIR_NO_INT)) {
1364 serial8250_handle_port(up, regs); 1364 serial8250_handle_port(up);
1365 1365
1366 handled = 1; 1366 handled = 1;
1367 1367
@@ -1461,7 +1461,7 @@ static void serial8250_timeout(unsigned long data)
1461 1461
1462 iir = serial_in(up, UART_IIR); 1462 iir = serial_in(up, UART_IIR);
1463 if (!(iir & UART_IIR_NO_INT)) 1463 if (!(iir & UART_IIR_NO_INT))
1464 serial8250_handle_port(up, NULL); 1464 serial8250_handle_port(up);
1465 1465
1466 timeout = up->port.timeout; 1466 timeout = up->port.timeout;
1467 timeout = timeout > 6 ? (timeout / 2 - 2) : 1; 1467 timeout = timeout > 6 ? (timeout / 2 - 2) : 1;