diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/serial/sunhv.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/serial/sunhv.c')
| -rw-r--r-- | drivers/serial/sunhv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c index f851f0f44f9b..03941d27d15d 100644 --- a/drivers/serial/sunhv.c +++ b/drivers/serial/sunhv.c | |||
| @@ -73,7 +73,7 @@ static inline long hypervisor_con_putchar(long ch) | |||
| 73 | 73 | ||
| 74 | static int hung_up = 0; | 74 | static int hung_up = 0; |
| 75 | 75 | ||
| 76 | static struct tty_struct *receive_chars(struct uart_port *port, struct pt_regs *regs) | 76 | static struct tty_struct *receive_chars(struct uart_port *port) |
| 77 | { | 77 | { |
| 78 | struct tty_struct *tty = NULL; | 78 | struct tty_struct *tty = NULL; |
| 79 | int saw_console_brk = 0; | 79 | int saw_console_brk = 0; |
| @@ -106,7 +106,7 @@ static struct tty_struct *receive_chars(struct uart_port *port, struct pt_regs * | |||
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | if (tty == NULL) { | 108 | if (tty == NULL) { |
| 109 | uart_handle_sysrq_char(port, c, regs); | 109 | uart_handle_sysrq_char(port, c); |
| 110 | continue; | 110 | continue; |
| 111 | } | 111 | } |
| 112 | 112 | ||
| @@ -119,7 +119,7 @@ static struct tty_struct *receive_chars(struct uart_port *port, struct pt_regs * | |||
| 119 | flag = TTY_BREAK; | 119 | flag = TTY_BREAK; |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | if (uart_handle_sysrq_char(port, c, regs)) | 122 | if (uart_handle_sysrq_char(port, c)) |
| 123 | continue; | 123 | continue; |
| 124 | 124 | ||
| 125 | if ((port->ignore_status_mask & IGNORE_ALL) || | 125 | if ((port->ignore_status_mask & IGNORE_ALL) || |
| @@ -161,14 +161,14 @@ static void transmit_chars(struct uart_port *port) | |||
| 161 | uart_write_wakeup(port); | 161 | uart_write_wakeup(port); |
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | static irqreturn_t sunhv_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 164 | static irqreturn_t sunhv_interrupt(int irq, void *dev_id) |
| 165 | { | 165 | { |
| 166 | struct uart_port *port = dev_id; | 166 | struct uart_port *port = dev_id; |
| 167 | struct tty_struct *tty; | 167 | struct tty_struct *tty; |
| 168 | unsigned long flags; | 168 | unsigned long flags; |
| 169 | 169 | ||
| 170 | spin_lock_irqsave(&port->lock, flags); | 170 | spin_lock_irqsave(&port->lock, flags); |
| 171 | tty = receive_chars(port, regs); | 171 | tty = receive_chars(port); |
| 172 | transmit_chars(port); | 172 | transmit_chars(port); |
| 173 | spin_unlock_irqrestore(&port->lock, flags); | 173 | spin_unlock_irqrestore(&port->lock, flags); |
| 174 | 174 | ||