diff options
Diffstat (limited to 'drivers/scsi/aha1542.c')
| -rw-r--r-- | drivers/scsi/aha1542.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c index 24f0f5461792..d7a61a6bdaae 100644 --- a/drivers/scsi/aha1542.c +++ b/drivers/scsi/aha1542.c | |||
| @@ -174,9 +174,8 @@ static DEFINE_SPINLOCK(aha1542_lock); | |||
| 174 | 174 | ||
| 175 | static void setup_mailboxes(int base_io, struct Scsi_Host *shpnt); | 175 | static void setup_mailboxes(int base_io, struct Scsi_Host *shpnt); |
| 176 | static int aha1542_restart(struct Scsi_Host *shost); | 176 | static int aha1542_restart(struct Scsi_Host *shost); |
| 177 | static void aha1542_intr_handle(struct Scsi_Host *shost, void *dev_id, struct pt_regs *regs); | 177 | static void aha1542_intr_handle(struct Scsi_Host *shost, void *dev_id); |
| 178 | static irqreturn_t do_aha1542_intr_handle(int irq, void *dev_id, | 178 | static irqreturn_t do_aha1542_intr_handle(int irq, void *dev_id); |
| 179 | struct pt_regs *regs); | ||
| 180 | 179 | ||
| 181 | #define aha1542_intr_reset(base) outb(IRST, CONTROL(base)) | 180 | #define aha1542_intr_reset(base) outb(IRST, CONTROL(base)) |
| 182 | 181 | ||
| @@ -416,8 +415,7 @@ fail: | |||
| 416 | } | 415 | } |
| 417 | 416 | ||
| 418 | /* A quick wrapper for do_aha1542_intr_handle to grab the spin lock */ | 417 | /* A quick wrapper for do_aha1542_intr_handle to grab the spin lock */ |
| 419 | static irqreturn_t do_aha1542_intr_handle(int irq, void *dev_id, | 418 | static irqreturn_t do_aha1542_intr_handle(int irq, void *dev_id) |
| 420 | struct pt_regs *regs) | ||
| 421 | { | 419 | { |
| 422 | unsigned long flags; | 420 | unsigned long flags; |
| 423 | struct Scsi_Host *shost; | 421 | struct Scsi_Host *shost; |
| @@ -427,13 +425,13 @@ static irqreturn_t do_aha1542_intr_handle(int irq, void *dev_id, | |||
| 427 | panic("Splunge!"); | 425 | panic("Splunge!"); |
| 428 | 426 | ||
| 429 | spin_lock_irqsave(shost->host_lock, flags); | 427 | spin_lock_irqsave(shost->host_lock, flags); |
| 430 | aha1542_intr_handle(shost, dev_id, regs); | 428 | aha1542_intr_handle(shost, dev_id); |
| 431 | spin_unlock_irqrestore(shost->host_lock, flags); | 429 | spin_unlock_irqrestore(shost->host_lock, flags); |
| 432 | return IRQ_HANDLED; | 430 | return IRQ_HANDLED; |
| 433 | } | 431 | } |
| 434 | 432 | ||
| 435 | /* A "high" level interrupt handler */ | 433 | /* A "high" level interrupt handler */ |
| 436 | static void aha1542_intr_handle(struct Scsi_Host *shost, void *dev_id, struct pt_regs *regs) | 434 | static void aha1542_intr_handle(struct Scsi_Host *shost, void *dev_id) |
| 437 | { | 435 | { |
| 438 | void (*my_done) (Scsi_Cmnd *) = NULL; | 436 | void (*my_done) (Scsi_Cmnd *) = NULL; |
| 439 | int errstatus, mbi, mbo, mbistatus; | 437 | int errstatus, mbi, mbo, mbistatus; |
