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/eata_pio.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/eata_pio.c')
| -rw-r--r-- | drivers/scsi/eata_pio.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c index d312633db92b..811d8840707e 100644 --- a/drivers/scsi/eata_pio.c +++ b/drivers/scsi/eata_pio.c | |||
| @@ -194,10 +194,9 @@ static void IncStat(struct scsi_pointer *SCp, unsigned int Increment) | |||
| 194 | } | 194 | } |
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | static irqreturn_t eata_pio_int_handler(int irq, void *dev_id, struct pt_regs *regs); | 197 | static irqreturn_t eata_pio_int_handler(int irq, void *dev_id); |
| 198 | 198 | ||
| 199 | static irqreturn_t do_eata_pio_int_handler(int irq, void *dev_id, | 199 | static irqreturn_t do_eata_pio_int_handler(int irq, void *dev_id) |
| 200 | struct pt_regs *regs) | ||
| 201 | { | 200 | { |
| 202 | unsigned long flags; | 201 | unsigned long flags; |
| 203 | struct Scsi_Host *dev = dev_id; | 202 | struct Scsi_Host *dev = dev_id; |
| @@ -209,7 +208,7 @@ static irqreturn_t do_eata_pio_int_handler(int irq, void *dev_id, | |||
| 209 | return ret; | 208 | return ret; |
| 210 | } | 209 | } |
| 211 | 210 | ||
| 212 | static irqreturn_t eata_pio_int_handler(int irq, void *dev_id, struct pt_regs *regs) | 211 | static irqreturn_t eata_pio_int_handler(int irq, void *dev_id) |
| 213 | { | 212 | { |
| 214 | unsigned int eata_stat = 0xfffff; | 213 | unsigned int eata_stat = 0xfffff; |
| 215 | struct scsi_cmnd *cmd; | 214 | struct scsi_cmnd *cmd; |