diff options
Diffstat (limited to 'drivers/serial/sn_console.c')
-rw-r--r-- | drivers/serial/sn_console.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c index 2f148e5b9255..709f93a6c18c 100644 --- a/drivers/serial/sn_console.c +++ b/drivers/serial/sn_console.c | |||
@@ -447,7 +447,6 @@ static int sn_debug_printf(const char *fmt, ...) | |||
447 | /** | 447 | /** |
448 | * sn_receive_chars - Grab characters, pass them to tty layer | 448 | * sn_receive_chars - Grab characters, pass them to tty layer |
449 | * @port: Port to operate on | 449 | * @port: Port to operate on |
450 | * @regs: Saved registers (needed by uart_handle_sysrq_char) | ||
451 | * @flags: irq flags | 450 | * @flags: irq flags |
452 | * | 451 | * |
453 | * Note: If we're not registered with the serial core infrastructure yet, | 452 | * Note: If we're not registered with the serial core infrastructure yet, |
@@ -455,8 +454,7 @@ static int sn_debug_printf(const char *fmt, ...) | |||
455 | * | 454 | * |
456 | */ | 455 | */ |
457 | static void | 456 | static void |
458 | sn_receive_chars(struct sn_cons_port *port, struct pt_regs *regs, | 457 | sn_receive_chars(struct sn_cons_port *port, unsigned long flags) |
459 | unsigned long flags) | ||
460 | { | 458 | { |
461 | int ch; | 459 | int ch; |
462 | struct tty_struct *tty; | 460 | struct tty_struct *tty; |
@@ -494,7 +492,7 @@ sn_receive_chars(struct sn_cons_port *port, struct pt_regs *regs, | |||
494 | sysrq_requested = 0; | 492 | sysrq_requested = 0; |
495 | if (ch && time_before(jiffies, sysrq_timeout)) { | 493 | if (ch && time_before(jiffies, sysrq_timeout)) { |
496 | spin_unlock_irqrestore(&port->sc_port.lock, flags); | 494 | spin_unlock_irqrestore(&port->sc_port.lock, flags); |
497 | handle_sysrq(ch, regs, NULL); | 495 | handle_sysrq(ch, NULL); |
498 | spin_lock_irqsave(&port->sc_port.lock, flags); | 496 | spin_lock_irqsave(&port->sc_port.lock, flags); |
499 | /* ignore actual sysrq command char */ | 497 | /* ignore actual sysrq command char */ |
500 | continue; | 498 | continue; |
@@ -615,10 +613,9 @@ static void sn_transmit_chars(struct sn_cons_port *port, int raw) | |||
615 | * sn_sal_interrupt - Handle console interrupts | 613 | * sn_sal_interrupt - Handle console interrupts |
616 | * @irq: irq #, useful for debug statements | 614 | * @irq: irq #, useful for debug statements |
617 | * @dev_id: our pointer to our port (sn_cons_port which contains the uart port) | 615 | * @dev_id: our pointer to our port (sn_cons_port which contains the uart port) |
618 | * @regs: Saved registers, used by sn_receive_chars for uart_handle_sysrq_char | ||
619 | * | 616 | * |
620 | */ | 617 | */ |
621 | static irqreturn_t sn_sal_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 618 | static irqreturn_t sn_sal_interrupt(int irq, void *dev_id) |
622 | { | 619 | { |
623 | struct sn_cons_port *port = (struct sn_cons_port *)dev_id; | 620 | struct sn_cons_port *port = (struct sn_cons_port *)dev_id; |
624 | unsigned long flags; | 621 | unsigned long flags; |
@@ -629,7 +626,7 @@ static irqreturn_t sn_sal_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
629 | 626 | ||
630 | spin_lock_irqsave(&port->sc_port.lock, flags); | 627 | spin_lock_irqsave(&port->sc_port.lock, flags); |
631 | if (status & SAL_CONSOLE_INTR_RECV) { | 628 | if (status & SAL_CONSOLE_INTR_RECV) { |
632 | sn_receive_chars(port, regs, flags); | 629 | sn_receive_chars(port, flags); |
633 | } | 630 | } |
634 | if (status & SAL_CONSOLE_INTR_XMIT) { | 631 | if (status & SAL_CONSOLE_INTR_XMIT) { |
635 | sn_transmit_chars(port, TRANSMIT_BUFFERED); | 632 | sn_transmit_chars(port, TRANSMIT_BUFFERED); |