diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/infiniband/hw/ehca/ehca_irq.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/infiniband/hw/ehca/ehca_irq.c')
| -rw-r--r-- | drivers/infiniband/hw/ehca/ehca_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c index 2a65b5be1979..048cc443d1e7 100644 --- a/drivers/infiniband/hw/ehca/ehca_irq.c +++ b/drivers/infiniband/hw/ehca/ehca_irq.c | |||
| @@ -360,7 +360,7 @@ static inline void reset_eq_pending(struct ehca_cq *cq) | |||
| 360 | return; | 360 | return; |
| 361 | } | 361 | } |
| 362 | 362 | ||
| 363 | irqreturn_t ehca_interrupt_neq(int irq, void *dev_id, struct pt_regs *regs) | 363 | irqreturn_t ehca_interrupt_neq(int irq, void *dev_id) |
| 364 | { | 364 | { |
| 365 | struct ehca_shca *shca = (struct ehca_shca*)dev_id; | 365 | struct ehca_shca *shca = (struct ehca_shca*)dev_id; |
| 366 | 366 | ||
| @@ -393,7 +393,7 @@ void ehca_tasklet_neq(unsigned long data) | |||
| 393 | return; | 393 | return; |
| 394 | } | 394 | } |
| 395 | 395 | ||
| 396 | irqreturn_t ehca_interrupt_eq(int irq, void *dev_id, struct pt_regs *regs) | 396 | irqreturn_t ehca_interrupt_eq(int irq, void *dev_id) |
| 397 | { | 397 | { |
| 398 | struct ehca_shca *shca = (struct ehca_shca*)dev_id; | 398 | struct ehca_shca *shca = (struct ehca_shca*)dev_id; |
| 399 | 399 | ||