diff options
Diffstat (limited to 'drivers/serial/68328serial.c')
-rw-r--r-- | drivers/serial/68328serial.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index bac853c5abb5..9b8b585513ec 100644 --- a/drivers/serial/68328serial.c +++ b/drivers/serial/68328serial.c | |||
@@ -275,8 +275,7 @@ static void status_handle(struct m68k_serial *info, unsigned short status) | |||
275 | return; | 275 | return; |
276 | } | 276 | } |
277 | 277 | ||
278 | static void receive_chars(struct m68k_serial *info, struct pt_regs *regs, | 278 | static void receive_chars(struct m68k_serial *info, unsigned short rx) |
279 | unsigned short rx) | ||
280 | { | 279 | { |
281 | struct tty_struct *tty = info->tty; | 280 | struct tty_struct *tty = info->tty; |
282 | m68328_uart *uart = &uart_addr[info->line]; | 281 | m68328_uart *uart = &uart_addr[info->line]; |
@@ -377,7 +376,7 @@ clear_and_return: | |||
377 | /* | 376 | /* |
378 | * This is the serial driver's generic interrupt routine | 377 | * This is the serial driver's generic interrupt routine |
379 | */ | 378 | */ |
380 | irqreturn_t rs_interrupt(int irq, void *dev_id, struct pt_regs * regs) | 379 | irqreturn_t rs_interrupt(int irq, void *dev_id) |
381 | { | 380 | { |
382 | struct m68k_serial * info; | 381 | struct m68k_serial * info; |
383 | m68328_uart *uart; | 382 | m68328_uart *uart; |
@@ -394,10 +393,10 @@ irqreturn_t rs_interrupt(int irq, void *dev_id, struct pt_regs * regs) | |||
394 | #ifdef USE_INTS | 393 | #ifdef USE_INTS |
395 | tx = uart->utx.w; | 394 | tx = uart->utx.w; |
396 | 395 | ||
397 | if (rx & URX_DATA_READY) receive_chars(info, regs, rx); | 396 | if (rx & URX_DATA_READY) receive_chars(info, rx); |
398 | if (tx & UTX_TX_AVAIL) transmit_chars(info); | 397 | if (tx & UTX_TX_AVAIL) transmit_chars(info); |
399 | #else | 398 | #else |
400 | receive_chars(info, regs, rx); | 399 | receive_chars(info, rx); |
401 | #endif | 400 | #endif |
402 | return IRQ_HANDLED; | 401 | return IRQ_HANDLED; |
403 | } | 402 | } |