8 files changed, 24 insertions, 24 deletions

diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index c9b0b8978cd8..e774dd31e99b 100644
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -328,7 +328,7 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
         kbd->dev->id.vendor     = PCI_VENDOR_ID_HP;
         kbd->dev->id.product    = 0x0001; /* TODO: get from kbd->rsc */
         kbd->dev->id.version    = 0x0100; /* TODO: get from kbd->rsc */
-        kbd->dev->dev           = &serio->dev;
+        kbd->dev->cdev.dev      = &serio->dev;
 
         for (i = 0; i < 128; i++) {
                 set_bit(hil_kbd_set1[i], kbd->dev->keybit);
diff --git a/drivers/input/mouse/hil_ptr.c b/drivers/input/mouse/hil_ptr.c
index 402b057e986e..4f2b503c1ac7 100644
--- a/drivers/input/mouse/hil_ptr.c
+++ b/drivers/input/mouse/hil_ptr.c
@@ -375,7 +375,7 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
         ptr->dev->id.vendor     = PCI_VENDOR_ID_HP;
         ptr->dev->id.product    = 0x0001; /* TODO: get from ptr->rsc */
         ptr->dev->id.version    = 0x0100; /* TODO: get from ptr->rsc */
-        ptr->dev->dev           = &serio->dev;
+        ptr->dev->cdev.dev      = &serio->dev;
 
         input_register_device(ptr->dev);
         printk(KERN_INFO "input: %s (%s), ID: %d\n",
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
index 081fdc3c7737..74f14e097789 100644
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
@@ -166,7 +166,7 @@ static inline int gscps2_writeb_output(struct gscps2port *ps2port, u8 data)
 
         /* make sure any received data is returned as fast as possible */
         /* this is important e.g. when we set the LEDs on the keyboard */
-        gscps2_interrupt(0, NULL, NULL);
+        gscps2_interrupt(0, NULL);
 
         return 1;
 }
@@ -306,7 +306,7 @@ static int gscps2_open(struct serio *port)
         /* enable it */
         gscps2_enable(ps2port, ENABLE);
 
-        gscps2_interrupt(0, NULL, NULL);
+        gscps2_interrupt(0, NULL);
 
         return 0;
 }
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c
index bbbe15e21904..bdfde046b741 100644
--- a/drivers/input/serio/hil_mlc.c
+++ b/drivers/input/serio/hil_mlc.c
@@ -162,10 +162,10 @@ static void hil_mlc_send_polls(hil_mlc *mlc) {
                 if (did != (p & HIL_PKT_ADDR_MASK) >> 8) {
                         if (drv == NULL || drv->interrupt == NULL) goto skip;
 
-                        drv->interrupt(serio, 0, 0, NULL);
-                        drv->interrupt(serio, HIL_ERR_INT >> 16, 0, NULL);
-                        drv->interrupt(serio, HIL_PKT_CMD >> 8,  0, NULL);
-                        drv->interrupt(serio, HIL_CMD_POL + cnt, 0, NULL);
+                        drv->interrupt(serio, 0, 0);
+                        drv->interrupt(serio, HIL_ERR_INT >> 16, 0);
+                        drv->interrupt(serio, HIL_PKT_CMD >> 8,  0);
+                        drv->interrupt(serio, HIL_CMD_POL + cnt, 0);
                 skip:
                         did = (p & HIL_PKT_ADDR_MASK) >> 8;
                         serio = did ? mlc->serio[mlc->di_map[did-1]] : NULL;
@@ -174,10 +174,10 @@ static void hil_mlc_send_polls(hil_mlc *mlc) {
                 }
                 cnt++; i++;
                 if (drv == NULL || drv->interrupt == NULL) continue;
-                drv->interrupt(serio, (p >> 24), 0, NULL);
-                drv->interrupt(serio, (p >> 16) & 0xff, 0, NULL);
-                drv->interrupt(serio, (p >> 8) & ~HIL_PKT_ADDR_MASK, 0, NULL);
-                drv->interrupt(serio, p & 0xff, 0, NULL);
+                drv->interrupt(serio, (p >> 24), 0);
+                drv->interrupt(serio, (p >> 16) & 0xff, 0);
+                drv->interrupt(serio, (p >> 8) & ~HIL_PKT_ADDR_MASK, 0);
+                drv->interrupt(serio, p & 0xff, 0);
         }
 }
 
@@ -780,16 +780,16 @@ static int hil_mlc_serio_write(struct serio *serio, unsigned char c) {
         while ((last != idx) && (*last == 0)) last--;
 
         while (idx != last) {
-                drv->interrupt(serio, 0, 0, NULL);
-                drv->interrupt(serio, HIL_ERR_INT >> 16, 0, NULL);
-                drv->interrupt(serio, 0, 0, NULL);
-                drv->interrupt(serio, *idx, 0, NULL);
+                drv->interrupt(serio, 0, 0);
+                drv->interrupt(serio, HIL_ERR_INT >> 16, 0);
+                drv->interrupt(serio, 0, 0);
+                drv->interrupt(serio, *idx, 0);
                 idx++;
         }
-        drv->interrupt(serio, 0, 0, NULL);
-        drv->interrupt(serio, HIL_ERR_INT >> 16, 0, NULL);
-        drv->interrupt(serio, HIL_PKT_CMD >> 8, 0, NULL);
-        drv->interrupt(serio, *idx, 0, NULL);
+        drv->interrupt(serio, 0, 0);
+        drv->interrupt(serio, HIL_ERR_INT >> 16, 0);
+        drv->interrupt(serio, HIL_PKT_CMD >> 8, 0);
+        drv->interrupt(serio, *idx, 0);
         
         mlc->serio_oidx[map->didx] = 0;
         mlc->serio_opacket[map->didx] = 0;
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c
index 8cbd940f0ac2..f4d815bca643 100644
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -1252,7 +1252,7 @@ static int __devinit i82596_probe(struct net_device *dev,
 static void i596_poll_controller(struct net_device *dev)
 {
         disable_irq(dev->irq);
-        i596_interrupt(dev->irq, dev, NULL);
+        i596_interrupt(dev->irq, dev);
         enable_irq(dev->irq);
 }
 #endif
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index a0a8fd8d2124..03c763c2d0e0 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -389,7 +389,7 @@ ilr_again:
                 int irq = dino_dev->global_irq[local_irq];
                 DBG(KERN_DEBUG "%s(%d, %p) mask 0x%x\n",
                         __FUNCTION__, irq, intr_dev, mask);
-                __do_IRQ(irq, regs);
+                __do_IRQ(irq);
                 mask &= ~(1 << local_irq);
         } while (mask);
 
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c
index 094562e044f3..e97cecbc4d18 100644
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
@@ -234,7 +234,7 @@ static irqreturn_t eisa_irq(int wax_irq, void *intr_dev)
         }
         spin_unlock_irqrestore(&eisa_irq_lock, flags);
 
-        __do_IRQ(irq, regs);
+        __do_IRQ(irq);
    
         spin_lock_irqsave(&eisa_irq_lock, flags);
         /* unmask */
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c
index aa819d3f8ee5..8ad1b8c5ec5d 100644
--- a/drivers/serial/mux.c
+++ b/drivers/serial/mux.c
@@ -230,7 +230,7 @@ static void mux_read(struct uart_port *port)
                                 continue;
                 }
 
-                if (uart_handle_sysrq_char(port, data & 0xffu, NULL))
+                if (uart_handle_sysrq_char(port, data & 0xffu))
                         continue;
 
                 tty_insert_flip_char(tty, data & 0xFF, TTY_NORMAL);