summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-12-13 16:14:14 -0800
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-01-11 18:28:11 -0600
commitbaa9aac6a15a1990e9d2d7a5648f53dfccc440ad (patch)
tree1225f5233a6d7faa84a0ced89218cf9f52c851d0
parentfc9b5118823e84b4ed0acddd99c1e453298e103d (diff)
downloadblackbird-op-linux-baa9aac6a15a1990e9d2d7a5648f53dfccc440ad.tar.gz
blackbird-op-linux-baa9aac6a15a1990e9d2d7a5648f53dfccc440ad.zip
[SCSI] NCR5380: minor irq handler cleanups
* remove unnecessary cast * remove unnecessary use of 'irq' function arg Signed-off-by: Jeff Garzik <jgarzik@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--drivers/scsi/NCR5380.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 1e9f82884f70..c1fb33292e56 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -1157,16 +1157,17 @@ static void NCR5380_main(struct work_struct *work)
* Locks: takes the needed instance locks
*/
-static irqreturn_t NCR5380_intr(int irq, void *dev_id)
+static irqreturn_t NCR5380_intr(int dummy, void *dev_id)
{
NCR5380_local_declare();
- struct Scsi_Host *instance = (struct Scsi_Host *)dev_id;
+ struct Scsi_Host *instance = dev_id;
struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;
int done;
unsigned char basr;
unsigned long flags;
- dprintk(NDEBUG_INTR, ("scsi : NCR5380 irq %d triggered\n", irq));
+ dprintk(NDEBUG_INTR, ("scsi : NCR5380 irq %d triggered\n",
+ instance->irq));
do {
done = 1;
OpenPOWER on IntegriCloud