diff options
Diffstat (limited to 'drivers/serial/m32r_sio.c')
| -rw-r--r-- | drivers/serial/m32r_sio.c | 14 | 
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index 28c9ce6f0bd..c85ac1a7760 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c @@ -323,8 +323,7 @@ static void m32r_sio_enable_ms(struct uart_port *port)  	serial_out(up, UART_IER, up->ier);  } -static void receive_chars(struct uart_sio_port *up, int *status, -			  struct pt_regs *regs) +static void receive_chars(struct uart_sio_port *up, int *status)  {  	struct tty_struct *tty = up->port.info->tty;  	unsigned char ch; @@ -378,7 +377,7 @@ static void receive_chars(struct uart_sio_port *up, int *status,  			else if (*status & UART_LSR_FE)  				flag = TTY_FRAME;  		} -		if (uart_handle_sysrq_char(&up->port, ch, regs)) +		if (uart_handle_sysrq_char(&up->port, ch))  			goto ignore_char;  		if ((*status & up->port.ignore_status_mask) == 0)  			tty_insert_flip_char(tty, ch, flag); @@ -439,12 +438,12 @@ static void transmit_chars(struct uart_sio_port *up)   * This handles the interrupt from one port.   */  static inline void m32r_sio_handle_port(struct uart_sio_port *up, -	unsigned int status, struct pt_regs *regs) +	unsigned int status)  {  	DEBUG_INTR("status = %x...", status);  	if (status & 0x04) -		receive_chars(up, &status, regs); +		receive_chars(up, &status);  	if (status & 0x01)  		transmit_chars(up);  } @@ -463,8 +462,7 @@ static inline void m32r_sio_handle_port(struct uart_sio_port *up,   * This means we need to loop through all ports. checking that they   * don't have an interrupt pending.   */ -static irqreturn_t m32r_sio_interrupt(int irq, void *dev_id, -	struct pt_regs *regs) +static irqreturn_t m32r_sio_interrupt(int irq, void *dev_id)  {  	struct irq_info *i = dev_id;  	struct list_head *l, *end = NULL; @@ -492,7 +490,7 @@ static irqreturn_t m32r_sio_interrupt(int irq, void *dev_id,  		sts = sio_in(up, SIOSTS);  		if (sts & 0x5) {  			spin_lock(&up->port.lock); -			m32r_sio_handle_port(up, sts, regs); +			m32r_sio_handle_port(up, sts);  			spin_unlock(&up->port.lock);  			end = NULL;  |