diff options
Diffstat (limited to 'arch/ia64/hp/sim/simserial.c')
-rw-r--r-- | arch/ia64/hp/sim/simserial.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c index 5095778be53c..caab986af70c 100644 --- a/arch/ia64/hp/sim/simserial.c +++ b/arch/ia64/hp/sim/simserial.c | |||
@@ -92,7 +92,7 @@ static struct serial_uart_config uart_config[] = { | |||
92 | { "ST16650V2", 32, UART_CLEAR_FIFO | UART_USE_FIFO | | 92 | { "ST16650V2", 32, UART_CLEAR_FIFO | UART_USE_FIFO | |
93 | UART_STARTECH }, | 93 | UART_STARTECH }, |
94 | { "TI16750", 64, UART_CLEAR_FIFO | UART_USE_FIFO}, | 94 | { "TI16750", 64, UART_CLEAR_FIFO | UART_USE_FIFO}, |
95 | { 0, 0} | 95 | { NULL, 0} |
96 | }; | 96 | }; |
97 | 97 | ||
98 | struct tty_driver *hp_simserial_driver; | 98 | struct tty_driver *hp_simserial_driver; |
@@ -555,7 +555,7 @@ static void shutdown(struct async_struct * info) | |||
555 | 555 | ||
556 | if (info->xmit.buf) { | 556 | if (info->xmit.buf) { |
557 | free_page((unsigned long) info->xmit.buf); | 557 | free_page((unsigned long) info->xmit.buf); |
558 | info->xmit.buf = 0; | 558 | info->xmit.buf = NULL; |
559 | } | 559 | } |
560 | 560 | ||
561 | if (info->tty) set_bit(TTY_IO_ERROR, &info->tty->flags); | 561 | if (info->tty) set_bit(TTY_IO_ERROR, &info->tty->flags); |
@@ -628,7 +628,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp) | |||
628 | if (tty->driver->flush_buffer) tty->driver->flush_buffer(tty); | 628 | if (tty->driver->flush_buffer) tty->driver->flush_buffer(tty); |
629 | if (tty->ldisc.flush_buffer) tty->ldisc.flush_buffer(tty); | 629 | if (tty->ldisc.flush_buffer) tty->ldisc.flush_buffer(tty); |
630 | info->event = 0; | 630 | info->event = 0; |
631 | info->tty = 0; | 631 | info->tty = NULL; |
632 | if (info->blocked_open) { | 632 | if (info->blocked_open) { |
633 | if (info->close_delay) | 633 | if (info->close_delay) |
634 | schedule_timeout_interruptible(info->close_delay); | 634 | schedule_timeout_interruptible(info->close_delay); |
@@ -668,7 +668,7 @@ static void rs_hangup(struct tty_struct *tty) | |||
668 | info->event = 0; | 668 | info->event = 0; |
669 | state->count = 0; | 669 | state->count = 0; |
670 | info->flags &= ~ASYNC_NORMAL_ACTIVE; | 670 | info->flags &= ~ASYNC_NORMAL_ACTIVE; |
671 | info->tty = 0; | 671 | info->tty = NULL; |
672 | wake_up_interruptible(&info->open_wait); | 672 | wake_up_interruptible(&info->open_wait); |
673 | } | 673 | } |
674 | 674 | ||
@@ -769,7 +769,7 @@ startup(struct async_struct *info) | |||
769 | /* | 769 | /* |
770 | * Insert serial port into IRQ chain. | 770 | * Insert serial port into IRQ chain. |
771 | */ | 771 | */ |
772 | info->prev_port = 0; | 772 | info->prev_port = NULL; |
773 | info->next_port = IRQ_ports[state->irq]; | 773 | info->next_port = IRQ_ports[state->irq]; |
774 | if (info->next_port) | 774 | if (info->next_port) |
775 | info->next_port->prev_port = info; | 775 | info->next_port->prev_port = info; |