[SCSI] aha152x, eata, u14-34f: minor irq handler cleanups

- remove pointless casts from void*

- remove needless references to 'irq' function argument, when that
  information is already stored somewhere in a driver-private struct.

- where the 'irq' function argument is known never to be used, rename
  it to 'dummy' to make this more obvious

- remove always-false tests for dev_id==NULL

- remove always-true tests for 'irq == host_struct->irq'

- replace per-irq lookup functions and tables with a direct reference
  to data object obtained via 'dev_id' function argument, passed from
  request_irq()

This change's main purpose is to prepare for the patchset in
jgarzik/misc-2.6.git#irq-remove, that explores removal of the
never-used 'irq' argument in each interrupt handler.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

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,
         }
 }
 
-static irqreturn_t ihdlr(int irq, struct Scsi_Host *shost)
+static irqreturn_t ihdlr(struct Scsi_Host *shost)
 {
         struct scsi_cmnd *SCpnt;
         unsigned int i, k, c, status, tstatus, reg;
         struct mssp *spp;
         struct mscp *cpp;
         struct hostdata *ha = (struct hostdata *)shost->hostdata;
-
-        if (shost->irq != irq)
-                panic("%s: ihdlr, irq %d, shost->irq %d.\n", ha->board_name, irq,
-                      shost->irq);
+        int irq = shost->irq;
 
         /* Check if this board need to be serviced */
         if (!(inb(shost->io_port + REG_AUX_STATUS) & IRQ_ASSERTED))
@@ -2535,7 +2532,7 @@ static irqreturn_t ihdlr(int irq, struct Scsi_Host *shost)
         return IRQ_NONE;
 }
 
-static irqreturn_t do_interrupt_handler(int irq, void *shap)
+static irqreturn_t do_interrupt_handler(int dummy, void *shap)
 {
         struct Scsi_Host *shost;
         unsigned int j;
@@ -2548,7 +2545,7 @@ static irqreturn_t do_interrupt_handler(int irq, void *shap)
         shost = sh[j];
 
         spin_lock_irqsave(shost->host_lock, spin_flags);
-        ret = ihdlr(irq, shost);
+        ret = ihdlr(shost);
         spin_unlock_irqrestore(shost->host_lock, spin_flags);
         return ret;
 }