diff options
Diffstat (limited to 'drivers/serial/m32r_sio.c')
-rw-r--r-- | drivers/serial/m32r_sio.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index 28c9ce6f0bdc..c85ac1a77608 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c | |||
@@ -323,8 +323,7 @@ static void m32r_sio_enable_ms(struct uart_port *port) | |||
323 | serial_out(up, UART_IER, up->ier); | 323 | serial_out(up, UART_IER, up->ier); |
324 | } | 324 | } |
325 | 325 | ||
326 | static void receive_chars(struct uart_sio_port *up, int *status, | 326 | static void receive_chars(struct uart_sio_port *up, int *status) |
327 | struct pt_regs *regs) | ||
328 | { | 327 | { |
329 | struct tty_struct *tty = up->port.info->tty; | 328 | struct tty_struct *tty = up->port.info->tty; |
330 | unsigned char ch; | 329 | unsigned char ch; |
@@ -378,7 +377,7 @@ static void receive_chars(struct uart_sio_port *up, int *status, | |||
378 | else if (*status & UART_LSR_FE) | 377 | else if (*status & UART_LSR_FE) |
379 | flag = TTY_FRAME; | 378 | flag = TTY_FRAME; |
380 | } | 379 | } |
381 | if (uart_handle_sysrq_char(&up->port, ch, regs)) | 380 | if (uart_handle_sysrq_char(&up->port, ch)) |
382 | goto ignore_char; | 381 | goto ignore_char; |
383 | if ((*status & up->port.ignore_status_mask) == 0) | 382 | if ((*status & up->port.ignore_status_mask) == 0) |
384 | tty_insert_flip_char(tty, ch, flag); | 383 | tty_insert_flip_char(tty, ch, flag); |
@@ -439,12 +438,12 @@ static void transmit_chars(struct uart_sio_port *up) | |||
439 | * This handles the interrupt from one port. | 438 | * This handles the interrupt from one port. |
440 | */ | 439 | */ |
441 | static inline void m32r_sio_handle_port(struct uart_sio_port *up, | 440 | static inline void m32r_sio_handle_port(struct uart_sio_port *up, |
442 | unsigned int status, struct pt_regs *regs) | 441 | unsigned int status) |
443 | { | 442 | { |
444 | DEBUG_INTR("status = %x...", status); | 443 | DEBUG_INTR("status = %x...", status); |
445 | 444 | ||
446 | if (status & 0x04) | 445 | if (status & 0x04) |
447 | receive_chars(up, &status, regs); | 446 | receive_chars(up, &status); |
448 | if (status & 0x01) | 447 | if (status & 0x01) |
449 | transmit_chars(up); | 448 | transmit_chars(up); |
450 | } | 449 | } |
@@ -463,8 +462,7 @@ static inline void m32r_sio_handle_port(struct uart_sio_port *up, | |||
463 | * This means we need to loop through all ports. checking that they | 462 | * This means we need to loop through all ports. checking that they |
464 | * don't have an interrupt pending. | 463 | * don't have an interrupt pending. |
465 | */ | 464 | */ |
466 | static irqreturn_t m32r_sio_interrupt(int irq, void *dev_id, | 465 | static irqreturn_t m32r_sio_interrupt(int irq, void *dev_id) |
467 | struct pt_regs *regs) | ||
468 | { | 466 | { |
469 | struct irq_info *i = dev_id; | 467 | struct irq_info *i = dev_id; |
470 | struct list_head *l, *end = NULL; | 468 | struct list_head *l, *end = NULL; |
@@ -492,7 +490,7 @@ static irqreturn_t m32r_sio_interrupt(int irq, void *dev_id, | |||
492 | sts = sio_in(up, SIOSTS); | 490 | sts = sio_in(up, SIOSTS); |
493 | if (sts & 0x5) { | 491 | if (sts & 0x5) { |
494 | spin_lock(&up->port.lock); | 492 | spin_lock(&up->port.lock); |
495 | m32r_sio_handle_port(up, sts, regs); | 493 | m32r_sio_handle_port(up, sts); |
496 | spin_unlock(&up->port.lock); | 494 | spin_unlock(&up->port.lock); |
497 | 495 | ||
498 | end = NULL; | 496 | end = NULL; |