diff options
Diffstat (limited to 'drivers/serial/pxa.c')
| -rw-r--r-- | drivers/serial/pxa.c | 10 | 
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index a720953a404..846089f222d 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c @@ -98,8 +98,7 @@ static void serial_pxa_stop_rx(struct uart_port *port)  	serial_out(up, UART_IER, up->ier);  } -static inline void -receive_chars(struct uart_pxa_port *up, int *status, struct pt_regs *regs) +static inline void receive_chars(struct uart_pxa_port *up, int *status)  {  	struct tty_struct *tty = up->port.info->tty;  	unsigned int ch, flag; @@ -153,7 +152,7 @@ receive_chars(struct uart_pxa_port *up, int *status, struct pt_regs *regs)  				flag = TTY_FRAME;  		} -		if (uart_handle_sysrq_char(&up->port, ch, regs)) +		if (uart_handle_sysrq_char(&up->port, ch))  			goto ignore_char;  		uart_insert_char(&up->port, *status, UART_LSR_OE, ch, flag); @@ -231,8 +230,7 @@ static inline void check_modem_status(struct uart_pxa_port *up)  /*   * This handles the interrupt from one port.   */ -static inline irqreturn_t -serial_pxa_irq(int irq, void *dev_id, struct pt_regs *regs) +static inline irqreturn_t serial_pxa_irq(int irq, void *dev_id)  {  	struct uart_pxa_port *up = (struct uart_pxa_port *)dev_id;  	unsigned int iir, lsr; @@ -242,7 +240,7 @@ serial_pxa_irq(int irq, void *dev_id, struct pt_regs *regs)  		return IRQ_NONE;  	lsr = serial_in(up, UART_LSR);  	if (lsr & UART_LSR_DR) -		receive_chars(up, &lsr, regs); +		receive_chars(up, &lsr);  	check_modem_status(up);  	if (lsr & UART_LSR_THRE)  		transmit_chars(up);  |