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/dec_esp.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/dec_esp.c')
| -rw-r--r-- | drivers/scsi/dec_esp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/dec_esp.c b/drivers/scsi/dec_esp.c index eb32062f7e68..c29ccbc44693 100644 --- a/drivers/scsi/dec_esp.c +++ b/drivers/scsi/dec_esp.c | |||
| @@ -94,9 +94,9 @@ volatile unsigned char pmaz_cmd_buffer[16]; | |||
| 94 | * via PIO. | 94 | * via PIO. |
| 95 | */ | 95 | */ |
| 96 | 96 | ||
| 97 | static irqreturn_t scsi_dma_merr_int(int, void *, struct pt_regs *); | 97 | static irqreturn_t scsi_dma_merr_int(int, void *); |
| 98 | static irqreturn_t scsi_dma_err_int(int, void *, struct pt_regs *); | 98 | static irqreturn_t scsi_dma_err_int(int, void *); |
| 99 | static irqreturn_t scsi_dma_int(int, void *, struct pt_regs *); | 99 | static irqreturn_t scsi_dma_int(int, void *); |
| 100 | 100 | ||
| 101 | static int dec_esp_detect(struct scsi_host_template * tpnt); | 101 | static int dec_esp_detect(struct scsi_host_template * tpnt); |
| 102 | 102 | ||
| @@ -307,7 +307,7 @@ err_dealloc: | |||
| 307 | } | 307 | } |
| 308 | 308 | ||
| 309 | /************************************************************* DMA Functions */ | 309 | /************************************************************* DMA Functions */ |
| 310 | static irqreturn_t scsi_dma_merr_int(int irq, void *dev_id, struct pt_regs *regs) | 310 | static irqreturn_t scsi_dma_merr_int(int irq, void *dev_id) |
| 311 | { | 311 | { |
| 312 | printk("Got unexpected SCSI DMA Interrupt! < "); | 312 | printk("Got unexpected SCSI DMA Interrupt! < "); |
| 313 | printk("SCSI_DMA_MEMRDERR "); | 313 | printk("SCSI_DMA_MEMRDERR "); |
| @@ -316,14 +316,14 @@ static irqreturn_t scsi_dma_merr_int(int irq, void *dev_id, struct pt_regs *regs | |||
| 316 | return IRQ_HANDLED; | 316 | return IRQ_HANDLED; |
| 317 | } | 317 | } |
| 318 | 318 | ||
| 319 | static irqreturn_t scsi_dma_err_int(int irq, void *dev_id, struct pt_regs *regs) | 319 | static irqreturn_t scsi_dma_err_int(int irq, void *dev_id) |
| 320 | { | 320 | { |
| 321 | /* empty */ | 321 | /* empty */ |
| 322 | 322 | ||
| 323 | return IRQ_HANDLED; | 323 | return IRQ_HANDLED; |
| 324 | } | 324 | } |
| 325 | 325 | ||
| 326 | static irqreturn_t scsi_dma_int(int irq, void *dev_id, struct pt_regs *regs) | 326 | static irqreturn_t scsi_dma_int(int irq, void *dev_id) |
| 327 | { | 327 | { |
| 328 | u32 scsi_next_ptr; | 328 | u32 scsi_next_ptr; |
| 329 | 329 | ||