diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/aic7xxx_old.c | 2 | ||||
-rw-r--r-- | drivers/scsi/ibmvscsi/ibmvstgt.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c index 3bfd9296bbfa..93984c9dfe14 100644 --- a/drivers/scsi/aic7xxx_old.c +++ b/drivers/scsi/aic7xxx_old.c | |||
@@ -6472,7 +6472,7 @@ do_aic7xxx_isr(int irq, void *dev_id) | |||
6472 | unsigned long cpu_flags; | 6472 | unsigned long cpu_flags; |
6473 | struct aic7xxx_host *p; | 6473 | struct aic7xxx_host *p; |
6474 | 6474 | ||
6475 | p = (struct aic7xxx_host *)dev_id; | 6475 | p = dev_id; |
6476 | if(!p) | 6476 | if(!p) |
6477 | return IRQ_NONE; | 6477 | return IRQ_NONE; |
6478 | spin_lock_irqsave(p->host->host_lock, cpu_flags); | 6478 | spin_lock_irqsave(p->host->host_lock, cpu_flags); |
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c index d63f11e95abf..bd62131b97a1 100644 --- a/drivers/scsi/ibmvscsi/ibmvstgt.c +++ b/drivers/scsi/ibmvscsi/ibmvstgt.c | |||
@@ -539,9 +539,9 @@ out: | |||
539 | srp_iu_put(iue); | 539 | srp_iu_put(iue); |
540 | } | 540 | } |
541 | 541 | ||
542 | static irqreturn_t ibmvstgt_interrupt(int irq, void *data) | 542 | static irqreturn_t ibmvstgt_interrupt(int dummy, void *data) |
543 | { | 543 | { |
544 | struct srp_target *target = (struct srp_target *) data; | 544 | struct srp_target *target = data; |
545 | struct vio_port *vport = target_to_port(target); | 545 | struct vio_port *vport = target_to_port(target); |
546 | 546 | ||
547 | vio_disable_interrupts(vport->dma_dev); | 547 | vio_disable_interrupts(vport->dma_dev); |