Merge branch 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6

+3 -3

arch/parisc/kernel/irq.c

··· 35 35 36 36 #undef PARISC_IRQ_CR16_COUNTS 37 37 38 - extern irqreturn_t timer_interrupt(int, void *, struct pt_regs *); 39 - extern irqreturn_t ipi_interrupt(int, void *, struct pt_regs *); 38 + extern irqreturn_t timer_interrupt(int, void *); 39 + extern irqreturn_t ipi_interrupt(int, void *); 40 40 41 41 #define EIEM_MASK(irq) (1UL<<(CPU_IRQ_MAX - irq)) 42 42 ··· 375 375 goto set_out; 376 376 } 377 377 #endif 378 - __do_IRQ(irq, regs); 378 + __do_IRQ(irq); 379 379 380 380 out: 381 381 irq_exit();

+1 -1

arch/parisc/kernel/time.c

··· 66 66 /* gcc can optimize for "read-only" case with a local clocktick */ 67 67 unsigned long cpt = clocktick; 68 68 69 - profile_tick(CPU_PROFILING, regs); 69 + profile_tick(CPU_PROFILING); 70 70 71 71 /* Initialize next_tick to the expected tick time. */ 72 72 next_tick = cpu_data[cpu].it_value;

+1 -1

drivers/input/keyboard/hil_kbd.c

··· 328 328 kbd->dev->id.vendor = PCI_VENDOR_ID_HP; 329 329 kbd->dev->id.product = 0x0001; /* TODO: get from kbd->rsc */ 330 330 kbd->dev->id.version = 0x0100; /* TODO: get from kbd->rsc */ 331 - kbd->dev->dev = &serio->dev; 331 + kbd->dev->cdev.dev = &serio->dev; 332 332 333 333 for (i = 0; i < 128; i++) { 334 334 set_bit(hil_kbd_set1[i], kbd->dev->keybit);

+1 -1

drivers/input/mouse/hil_ptr.c

··· 375 375 ptr->dev->id.vendor = PCI_VENDOR_ID_HP; 376 376 ptr->dev->id.product = 0x0001; /* TODO: get from ptr->rsc */ 377 377 ptr->dev->id.version = 0x0100; /* TODO: get from ptr->rsc */ 378 - ptr->dev->dev = &serio->dev; 378 + ptr->dev->cdev.dev = &serio->dev; 379 379 380 380 input_register_device(ptr->dev); 381 381 printk(KERN_INFO "input: %s (%s), ID: %d\n",

+2 -2

drivers/input/serio/gscps2.c

··· 166 166 167 167 /* make sure any received data is returned as fast as possible */ 168 168 /* this is important e.g. when we set the LEDs on the keyboard */ 169 - gscps2_interrupt(0, NULL, NULL); 169 + gscps2_interrupt(0, NULL); 170 170 171 171 return 1; 172 172 } ··· 306 306 /* enable it */ 307 307 gscps2_enable(ps2port, ENABLE); 308 308 309 - gscps2_interrupt(0, NULL, NULL); 309 + gscps2_interrupt(0, NULL); 310 310 311 311 return 0; 312 312 }

+16 -16

drivers/input/serio/hil_mlc.c

··· 162 162 if (did != (p & HIL_PKT_ADDR_MASK) >> 8) { 163 163 if (drv == NULL || drv->interrupt == NULL) goto skip; 164 164 165 - drv->interrupt(serio, 0, 0, NULL); 166 - drv->interrupt(serio, HIL_ERR_INT >> 16, 0, NULL); 167 - drv->interrupt(serio, HIL_PKT_CMD >> 8, 0, NULL); 168 - drv->interrupt(serio, HIL_CMD_POL + cnt, 0, NULL); 165 + drv->interrupt(serio, 0, 0); 166 + drv->interrupt(serio, HIL_ERR_INT >> 16, 0); 167 + drv->interrupt(serio, HIL_PKT_CMD >> 8, 0); 168 + drv->interrupt(serio, HIL_CMD_POL + cnt, 0); 169 169 skip: 170 170 did = (p & HIL_PKT_ADDR_MASK) >> 8; 171 171 serio = did ? mlc->serio[mlc->di_map[did-1]] : NULL; ··· 174 174 } 175 175 cnt++; i++; 176 176 if (drv == NULL || drv->interrupt == NULL) continue; 177 - drv->interrupt(serio, (p >> 24), 0, NULL); 178 - drv->interrupt(serio, (p >> 16) & 0xff, 0, NULL); 179 - drv->interrupt(serio, (p >> 8) & ~HIL_PKT_ADDR_MASK, 0, NULL); 180 - drv->interrupt(serio, p & 0xff, 0, NULL); 177 + drv->interrupt(serio, (p >> 24), 0); 178 + drv->interrupt(serio, (p >> 16) & 0xff, 0); 179 + drv->interrupt(serio, (p >> 8) & ~HIL_PKT_ADDR_MASK, 0); 180 + drv->interrupt(serio, p & 0xff, 0); 181 181 } 182 182 } 183 183 ··· 780 780 while ((last != idx) && (*last == 0)) last--; 781 781 782 782 while (idx != last) { 783 - drv->interrupt(serio, 0, 0, NULL); 784 - drv->interrupt(serio, HIL_ERR_INT >> 16, 0, NULL); 785 - drv->interrupt(serio, 0, 0, NULL); 786 - drv->interrupt(serio, *idx, 0, NULL); 783 + drv->interrupt(serio, 0, 0); 784 + drv->interrupt(serio, HIL_ERR_INT >> 16, 0); 785 + drv->interrupt(serio, 0, 0); 786 + drv->interrupt(serio, *idx, 0); 787 787 idx++; 788 788 } 789 - drv->interrupt(serio, 0, 0, NULL); 790 - drv->interrupt(serio, HIL_ERR_INT >> 16, 0, NULL); 791 - drv->interrupt(serio, HIL_PKT_CMD >> 8, 0, NULL); 792 - drv->interrupt(serio, *idx, 0, NULL); 789 + drv->interrupt(serio, 0, 0); 790 + drv->interrupt(serio, HIL_ERR_INT >> 16, 0); 791 + drv->interrupt(serio, HIL_PKT_CMD >> 8, 0); 792 + drv->interrupt(serio, *idx, 0); 793 793 794 794 mlc->serio_oidx[map->didx] = 0; 795 795 mlc->serio_opacket[map->didx] = 0;

+1 -1

drivers/net/lasi_82596.c

··· 1252 1252 static void i596_poll_controller(struct net_device *dev) 1253 1253 { 1254 1254 disable_irq(dev->irq); 1255 - i596_interrupt(dev->irq, dev, NULL); 1255 + i596_interrupt(dev->irq, dev); 1256 1256 enable_irq(dev->irq); 1257 1257 } 1258 1258 #endif

+1 -1

drivers/parisc/dino.c

··· 389 389 int irq = dino_dev->global_irq[local_irq]; 390 390 DBG(KERN_DEBUG "%s(%d, %p) mask 0x%x\n", 391 391 __FUNCTION__, irq, intr_dev, mask); 392 - __do_IRQ(irq, regs); 392 + __do_IRQ(irq); 393 393 mask &= ~(1 << local_irq); 394 394 } while (mask); 395 395

+1 -1

drivers/parisc/eisa.c

··· 234 234 } 235 235 spin_unlock_irqrestore(&eisa_irq_lock, flags); 236 236 237 - __do_IRQ(irq, regs); 237 + __do_IRQ(irq); 238 238 239 239 spin_lock_irqsave(&eisa_irq_lock, flags); 240 240 /* unmask */

+1 -1

drivers/serial/mux.c

··· 230 230 continue; 231 231 } 232 232 233 - if (uart_handle_sysrq_char(port, data & 0xffu, NULL)) 233 + if (uart_handle_sysrq_char(port, data & 0xffu)) 234 234 continue; 235 235 236 236 tty_insert_flip_char(tty, data & 0xFF, TTY_NORMAL);

+1

include/asm-parisc/irq_regs.h

··· 1 + #include <asm-generic/irq_regs.h>