diff options
Diffstat (limited to 'drivers/serial/sa1100.c')
| -rw-r--r-- | drivers/serial/sa1100.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c index db3486d33870..d4065266b6fc 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/serial/sa1100.c | |||
| @@ -190,7 +190,7 @@ static void sa1100_enable_ms(struct uart_port *port) | |||
| 190 | } | 190 | } |
| 191 | 191 | ||
| 192 | static void | 192 | static void |
| 193 | sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs) | 193 | sa1100_rx_chars(struct sa1100_port *sport) |
| 194 | { | 194 | { |
| 195 | struct tty_struct *tty = sport->port.info->tty; | 195 | struct tty_struct *tty = sport->port.info->tty; |
| 196 | unsigned int status, ch, flg; | 196 | unsigned int status, ch, flg; |
| @@ -228,7 +228,7 @@ sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs) | |||
| 228 | #endif | 228 | #endif |
| 229 | } | 229 | } |
| 230 | 230 | ||
| 231 | if (uart_handle_sysrq_char(&sport->port, ch, regs)) | 231 | if (uart_handle_sysrq_char(&sport->port, ch)) |
| 232 | goto ignore_char; | 232 | goto ignore_char; |
| 233 | 233 | ||
| 234 | uart_insert_char(&sport->port, status, UTSR1_TO_SM(UTSR1_ROR), ch, flg); | 234 | uart_insert_char(&sport->port, status, UTSR1_TO_SM(UTSR1_ROR), ch, flg); |
| @@ -281,7 +281,7 @@ static void sa1100_tx_chars(struct sa1100_port *sport) | |||
| 281 | sa1100_stop_tx(&sport->port); | 281 | sa1100_stop_tx(&sport->port); |
| 282 | } | 282 | } |
| 283 | 283 | ||
| 284 | static irqreturn_t sa1100_int(int irq, void *dev_id, struct pt_regs *regs) | 284 | static irqreturn_t sa1100_int(int irq, void *dev_id) |
| 285 | { | 285 | { |
| 286 | struct sa1100_port *sport = dev_id; | 286 | struct sa1100_port *sport = dev_id; |
| 287 | unsigned int status, pass_counter = 0; | 287 | unsigned int status, pass_counter = 0; |
| @@ -294,7 +294,7 @@ static irqreturn_t sa1100_int(int irq, void *dev_id, struct pt_regs *regs) | |||
| 294 | /* Clear the receiver idle bit, if set */ | 294 | /* Clear the receiver idle bit, if set */ |
| 295 | if (status & UTSR0_RID) | 295 | if (status & UTSR0_RID) |
| 296 | UART_PUT_UTSR0(sport, UTSR0_RID); | 296 | UART_PUT_UTSR0(sport, UTSR0_RID); |
| 297 | sa1100_rx_chars(sport, regs); | 297 | sa1100_rx_chars(sport); |
| 298 | } | 298 | } |
| 299 | 299 | ||
| 300 | /* Clear the relevant break bits */ | 300 | /* Clear the relevant break bits */ |
