1 files changed, 10 insertions, 10 deletions

diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 246eb3d3757a..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[] = {
         { "ST16650V2", 32, UART_CLEAR_FIFO | UART_USE_FIFO |
                   UART_STARTECH },
         { "TI16750", 64, UART_CLEAR_FIFO | UART_USE_FIFO},
-        { 0, 0}
+        { NULL, 0}
 };
 
 struct tty_driver *hp_simserial_driver;
@@ -130,7 +130,7 @@ static void rs_start(struct tty_struct *tty)
 #endif
 }
 
-static  void receive_chars(struct tty_struct *tty, struct pt_regs *regs)
+static  void receive_chars(struct tty_struct *tty)
 {
         unsigned char ch;
         static unsigned char seen_esc = 0;
@@ -152,7 +152,7 @@ static  void receive_chars(struct tty_struct *tty, struct pt_regs *regs)
                                                 ch = ia64_ssc(0, 0, 0, 0,
                                                               SSC_GETCHAR);
                                         while (!ch);
-                                        handle_sysrq(ch, regs, NULL);
+                                        handle_sysrq(ch, NULL);
                                 }
 #endif
                                 seen_esc = 0;
@@ -170,7 +170,7 @@ static  void receive_chars(struct tty_struct *tty, struct pt_regs *regs)
 /*
  * This is the serial driver's interrupt routine for a single port
  */
-static irqreturn_t rs_interrupt_single(int irq, void *dev_id, struct pt_regs * regs)
+static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
 {
         struct async_struct * info;
 
@@ -187,7 +187,7 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id, struct pt_regs * r
          * pretty simple in our case, because we only get interrupts
          * on inbound traffic
          */
-        receive_chars(info->tty, regs);
+        receive_chars(info->tty);
         return IRQ_HANDLED;
 }
 
@@ -555,7 +555,7 @@ static void shutdown(struct async_struct * info)
 
                 if (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);
@@ -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->ldisc.flush_buffer) tty->ldisc.flush_buffer(tty);
         info->event = 0;
-        info->tty = 0;
+        info->tty = NULL;
         if (info->blocked_open) {
                 if (info->close_delay)
                         schedule_timeout_interruptible(info->close_delay);
@@ -668,7 +668,7 @@ static void rs_hangup(struct tty_struct *tty)
         info->event = 0;
         state->count = 0;
         info->flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->tty = 0;
+        info->tty = NULL;
         wake_up_interruptible(&info->open_wait);
 }
 
@@ -714,7 +714,7 @@ startup(struct async_struct *info)
 {
         unsigned long flags;
         int     retval=0;
-        irqreturn_t (*handler)(int, void *, struct pt_regs *);
+        irq_handler_t handler;
         struct serial_state *state= info->state;
         unsigned long page;
 
@@ -769,7 +769,7 @@ startup(struct async_struct *info)
         /*
          * Insert serial port into IRQ chain.
          */
-        info->prev_port = 0;
+        info->prev_port = NULL;
         info->next_port = IRQ_ports[state->irq];
         if (info->next_port)
                 info->next_port->prev_port = info;