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/scsi/qlogicfas408.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/scsi/qlogicfas408.c')
| -rw-r--r-- | drivers/scsi/qlogicfas408.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c index 52fb2ec3da70..1a7de3bd796f 100644 --- a/drivers/scsi/qlogicfas408.c +++ b/drivers/scsi/qlogicfas408.c | |||
| @@ -405,7 +405,7 @@ static unsigned int ql_pcmd(Scsi_Cmnd * cmd) | |||
| 405 | * Interrupt handler | 405 | * Interrupt handler |
| 406 | */ | 406 | */ |
| 407 | 407 | ||
| 408 | static void ql_ihandl(int irq, void *dev_id, struct pt_regs *regs) | 408 | static void ql_ihandl(int irq, void *dev_id) |
| 409 | { | 409 | { |
| 410 | Scsi_Cmnd *icmd; | 410 | Scsi_Cmnd *icmd; |
| 411 | struct Scsi_Host *host = (struct Scsi_Host *)dev_id; | 411 | struct Scsi_Host *host = (struct Scsi_Host *)dev_id; |
| @@ -432,13 +432,13 @@ static void ql_ihandl(int irq, void *dev_id, struct pt_regs *regs) | |||
| 432 | (icmd->scsi_done) (icmd); | 432 | (icmd->scsi_done) (icmd); |
| 433 | } | 433 | } |
| 434 | 434 | ||
| 435 | irqreturn_t qlogicfas408_ihandl(int irq, void *dev_id, struct pt_regs *regs) | 435 | irqreturn_t qlogicfas408_ihandl(int irq, void *dev_id) |
| 436 | { | 436 | { |
| 437 | unsigned long flags; | 437 | unsigned long flags; |
| 438 | struct Scsi_Host *host = dev_id; | 438 | struct Scsi_Host *host = dev_id; |
| 439 | 439 | ||
| 440 | spin_lock_irqsave(host->host_lock, flags); | 440 | spin_lock_irqsave(host->host_lock, flags); |
| 441 | ql_ihandl(irq, dev_id, regs); | 441 | ql_ihandl(irq, dev_id); |
| 442 | spin_unlock_irqrestore(host->host_lock, flags); | 442 | spin_unlock_irqrestore(host->host_lock, flags); |
| 443 | return IRQ_HANDLED; | 443 | return IRQ_HANDLED; |
| 444 | } | 444 | } |