lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] ia64/hp NULL noise removal

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro
2006-10-10 22:46:17 +01:00
committed by Linus Torvalds
parent ba46df984b
commit cfa7fd72ca
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ia64/hp/sim/simeth.c
View File

@@ -87,7 +87,7 @@ static int simeth_debug; /* set to 1 to get debug information */
*/ */
static struct notifier_block simeth_dev_notifier = { static struct notifier_block simeth_dev_notifier = {
simeth_device_event, simeth_device_event,
0 NULL
}; };

2
arch/ia64/hp/sim/simscsi.c
View File

@@ -103,7 +103,7 @@ simscsi_interrupt (unsigned long val)
while ((sc = queue[rd].sc) != 0) { while ((sc = queue[rd].sc) != 0) {
atomic_dec(&num_reqs); atomic_dec(&num_reqs);
queue[rd].sc = 0; queue[rd].sc = NULL;
if (DBG) if (DBG)
printk("simscsi_interrupt: done with %ld\n", sc->serial_number); printk("simscsi_interrupt: done with %ld\n", sc->serial_number);
(*sc->scsi_done)(sc); (*sc->scsi_done)(sc);

10
arch/ia64/hp/sim/simserial.c
View File

@@ -92,7 +92,7 @@ static struct serial_uart_config uart_config[] = {
{ "ST16650V2", 32, UART_CLEAR_FIFO | UART_USE_FIFO | { "ST16650V2", 32, UART_CLEAR_FIFO | UART_USE_FIFO |
UART_STARTECH }, UART_STARTECH },
{ "TI16750", 64, UART_CLEAR_FIFO | UART_USE_FIFO}, { "TI16750", 64, UART_CLEAR_FIFO | UART_USE_FIFO},
{ 0, 0} { NULL, 0}
}; };
struct tty_driver *hp_simserial_driver; struct tty_driver *hp_simserial_driver;
@@ -555,7 +555,7 @@ static void shutdown(struct async_struct * info)
if (info->xmit.buf) { if (info->xmit.buf) {
free_page((unsigned long) info->xmit.buf); free_page((unsigned long) info->xmit.buf);
info->xmit.buf = 0; info->xmit.buf = NULL;
} }
if (info->tty) set_bit(TTY_IO_ERROR, &info->tty->flags); 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)
if (tty->driver->flush_buffer) tty->driver->flush_buffer(tty); if (tty->driver->flush_buffer) tty->driver->flush_buffer(tty);
if (tty->ldisc.flush_buffer) tty->ldisc.flush_buffer(tty); if (tty->ldisc.flush_buffer) tty->ldisc.flush_buffer(tty);
info->event = 0; info->event = 0;
info->tty = 0; info->tty = NULL;
if (info->blocked_open) { if (info->blocked_open) {
if (info->close_delay) if (info->close_delay)
schedule_timeout_interruptible(info->close_delay); schedule_timeout_interruptible(info->close_delay);
@@ -668,7 +668,7 @@ static void rs_hangup(struct tty_struct *tty)
info->event = 0; info->event = 0;
state->count = 0; state->count = 0;
info->flags &= ~ASYNC_NORMAL_ACTIVE; info->flags &= ~ASYNC_NORMAL_ACTIVE;
info->tty = 0; info->tty = NULL;
wake_up_interruptible(&info->open_wait); wake_up_interruptible(&info->open_wait);
} }
@@ -769,7 +769,7 @@ startup(struct async_struct *info)
/* /*
* Insert serial port into IRQ chain. * Insert serial port into IRQ chain.
*/ */
info->prev_port = 0; info->prev_port = NULL;
info->next_port = IRQ_ports[state->irq]; info->next_port = IRQ_ports[state->irq];
if (info->next_port) if (info->next_port)
info->next_port->prev_port = info; info->next_port->prev_port = info;