aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/ip22zilog.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/serial/ip22zilog.c')
-rw-r--r--drivers/serial/ip22zilog.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c
index dbf13c03a1bb..dca6c1bde8f9 100644
--- a/drivers/serial/ip22zilog.c
+++ b/drivers/serial/ip22zilog.c
@@ -252,8 +252,7 @@ static void ip22zilog_maybe_update_regs(struct uart_ip22zilog_port *up,
252} 252}
253 253
254static void ip22zilog_receive_chars(struct uart_ip22zilog_port *up, 254static void ip22zilog_receive_chars(struct uart_ip22zilog_port *up,
255 struct zilog_channel *channel, 255 struct zilog_channel *channel)
256 struct pt_regs *regs)
257{ 256{
258 struct tty_struct *tty = up->port.info->tty; /* XXX info==NULL? */ 257 struct tty_struct *tty = up->port.info->tty; /* XXX info==NULL? */
259 258
@@ -319,7 +318,7 @@ static void ip22zilog_receive_chars(struct uart_ip22zilog_port *up,
319 else if (r1 & CRC_ERR) 318 else if (r1 & CRC_ERR)
320 flag = TTY_FRAME; 319 flag = TTY_FRAME;
321 } 320 }
322 if (uart_handle_sysrq_char(&up->port, ch, regs)) 321 if (uart_handle_sysrq_char(&up->port, ch))
323 goto next_char; 322 goto next_char;
324 323
325 if (up->port.ignore_status_mask == 0xff || 324 if (up->port.ignore_status_mask == 0xff ||
@@ -339,8 +338,7 @@ static void ip22zilog_receive_chars(struct uart_ip22zilog_port *up,
339} 338}
340 339
341static void ip22zilog_status_handle(struct uart_ip22zilog_port *up, 340static void ip22zilog_status_handle(struct uart_ip22zilog_port *up,
342 struct zilog_channel *channel, 341 struct zilog_channel *channel)
343 struct pt_regs *regs)
344{ 342{
345 unsigned char status; 343 unsigned char status;
346 344
@@ -443,7 +441,7 @@ ack_tx_int:
443 ZS_WSYNC(channel); 441 ZS_WSYNC(channel);
444} 442}
445 443
446static irqreturn_t ip22zilog_interrupt(int irq, void *dev_id, struct pt_regs *regs) 444static irqreturn_t ip22zilog_interrupt(int irq, void *dev_id)
447{ 445{
448 struct uart_ip22zilog_port *up = dev_id; 446 struct uart_ip22zilog_port *up = dev_id;
449 447
@@ -462,9 +460,9 @@ static irqreturn_t ip22zilog_interrupt(int irq, void *dev_id, struct pt_regs *re
462 ZS_WSYNC(channel); 460 ZS_WSYNC(channel);
463 461
464 if (r3 & CHARxIP) 462 if (r3 & CHARxIP)
465 ip22zilog_receive_chars(up, channel, regs); 463 ip22zilog_receive_chars(up, channel);
466 if (r3 & CHAEXT) 464 if (r3 & CHAEXT)
467 ip22zilog_status_handle(up, channel, regs); 465 ip22zilog_status_handle(up, channel);
468 if (r3 & CHATxIP) 466 if (r3 & CHATxIP)
469 ip22zilog_transmit_chars(up, channel); 467 ip22zilog_transmit_chars(up, channel);
470 } 468 }
@@ -481,9 +479,9 @@ static irqreturn_t ip22zilog_interrupt(int irq, void *dev_id, struct pt_regs *re
481 ZS_WSYNC(channel); 479 ZS_WSYNC(channel);
482 480
483 if (r3 & CHBRxIP) 481 if (r3 & CHBRxIP)
484 ip22zilog_receive_chars(up, channel, regs); 482 ip22zilog_receive_chars(up, channel);
485 if (r3 & CHBEXT) 483 if (r3 & CHBEXT)
486 ip22zilog_status_handle(up, channel, regs); 484 ip22zilog_status_handle(up, channel);
487 if (r3 & CHBTxIP) 485 if (r3 & CHBTxIP)
488 ip22zilog_transmit_chars(up, channel); 486 ip22zilog_transmit_chars(up, channel);
489 } 487 }