aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2010-11-17 22:56:48 -0500
committerJeff Garzik <jgarzik@redhat.com>2011-01-05 19:43:22 -0500
commitb27dcfb0670ea7352a67137f4ff7947c2a9f6892 (patch)
treecd48976174179304780651fa4e75bd5d1ffd1522 /drivers/scsi
parent02cdfcf043c5c6ebcbbaba1c35130b5fbcb10867 (diff)
[libata] avoid needlessly passing around ptr to SCSI completion func
It's stored in struct scsi_cmnd->scsi_done, making several 'done' parameters to functions redundant. Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ipr.c2
-rw-r--r--drivers/scsi/libsas/sas_scsi_host.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 5bbaee597e88..2c71927aad64 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -5743,7 +5743,7 @@ static int ipr_queuecommand_lck(struct scsi_cmnd *scsi_cmd,
5743 } 5743 }
5744 5744
5745 if (ipr_is_gata(res) && res->sata_port) 5745 if (ipr_is_gata(res) && res->sata_port)
5746 return ata_sas_queuecmd(scsi_cmd, done, res->sata_port->ap); 5746 return ata_sas_queuecmd(scsi_cmd, res->sata_port->ap);
5747 5747
5748 ipr_cmd = ipr_get_free_ipr_cmnd(ioa_cfg); 5748 ipr_cmd = ipr_get_free_ipr_cmnd(ioa_cfg);
5749 ioarcb = &ipr_cmd->ioarcb; 5749 ioarcb = &ipr_cmd->ioarcb;
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 29251fabecc6..5815cbeb27a6 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -211,8 +211,7 @@ static int sas_queuecommand_lck(struct scsi_cmnd *cmd,
211 unsigned long flags; 211 unsigned long flags;
212 212
213 spin_lock_irqsave(dev->sata_dev.ap->lock, flags); 213 spin_lock_irqsave(dev->sata_dev.ap->lock, flags);
214 res = ata_sas_queuecmd(cmd, scsi_done, 214 res = ata_sas_queuecmd(cmd, dev->sata_dev.ap);
215 dev->sata_dev.ap);
216 spin_unlock_irqrestore(dev->sata_dev.ap->lock, flags); 215 spin_unlock_irqrestore(dev->sata_dev.ap->lock, flags);
217 goto out; 216 goto out;
218 } 217 }