diff options
Diffstat (limited to 'drivers/scsi/eata.c')
-rw-r--r-- | drivers/scsi/eata.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c index 8be3d76656fa..a73a6bbb1b2b 100644 --- a/drivers/scsi/eata.c +++ b/drivers/scsi/eata.c | |||
@@ -2286,17 +2286,14 @@ static void flush_dev(struct scsi_device *dev, unsigned long cursec, | |||
2286 | } | 2286 | } |
2287 | } | 2287 | } |
2288 | 2288 | ||
2289 | static irqreturn_t ihdlr(int irq, struct Scsi_Host *shost) | 2289 | static irqreturn_t ihdlr(struct Scsi_Host *shost) |
2290 | { | 2290 | { |
2291 | struct scsi_cmnd *SCpnt; | 2291 | struct scsi_cmnd *SCpnt; |
2292 | unsigned int i, k, c, status, tstatus, reg; | 2292 | unsigned int i, k, c, status, tstatus, reg; |
2293 | struct mssp *spp; | 2293 | struct mssp *spp; |
2294 | struct mscp *cpp; | 2294 | struct mscp *cpp; |
2295 | struct hostdata *ha = (struct hostdata *)shost->hostdata; | 2295 | struct hostdata *ha = (struct hostdata *)shost->hostdata; |
2296 | 2296 | int irq = shost->irq; | |
2297 | if (shost->irq != irq) | ||
2298 | panic("%s: ihdlr, irq %d, shost->irq %d.\n", ha->board_name, irq, | ||
2299 | shost->irq); | ||
2300 | 2297 | ||
2301 | /* Check if this board need to be serviced */ | 2298 | /* Check if this board need to be serviced */ |
2302 | if (!(inb(shost->io_port + REG_AUX_STATUS) & IRQ_ASSERTED)) | 2299 | if (!(inb(shost->io_port + REG_AUX_STATUS) & IRQ_ASSERTED)) |
@@ -2535,7 +2532,7 @@ static irqreturn_t ihdlr(int irq, struct Scsi_Host *shost) | |||
2535 | return IRQ_NONE; | 2532 | return IRQ_NONE; |
2536 | } | 2533 | } |
2537 | 2534 | ||
2538 | static irqreturn_t do_interrupt_handler(int irq, void *shap) | 2535 | static irqreturn_t do_interrupt_handler(int dummy, void *shap) |
2539 | { | 2536 | { |
2540 | struct Scsi_Host *shost; | 2537 | struct Scsi_Host *shost; |
2541 | unsigned int j; | 2538 | unsigned int j; |
@@ -2548,7 +2545,7 @@ static irqreturn_t do_interrupt_handler(int irq, void *shap) | |||
2548 | shost = sh[j]; | 2545 | shost = sh[j]; |
2549 | 2546 | ||
2550 | spin_lock_irqsave(shost->host_lock, spin_flags); | 2547 | spin_lock_irqsave(shost->host_lock, spin_flags); |
2551 | ret = ihdlr(irq, shost); | 2548 | ret = ihdlr(shost); |
2552 | spin_unlock_irqrestore(shost->host_lock, spin_flags); | 2549 | spin_unlock_irqrestore(shost->host_lock, spin_flags); |
2553 | return ret; | 2550 | return ret; |
2554 | } | 2551 | } |