diff options
Diffstat (limited to 'drivers/message/fusion/mptscsih.c')
-rw-r--r-- | drivers/message/fusion/mptscsih.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 727819cc7034..2a1c6f21af27 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
@@ -1304,7 +1304,6 @@ int mptscsih_show_info(struct seq_file *m, struct Scsi_Host *host) | |||
1304 | /** | 1304 | /** |
1305 | * mptscsih_qcmd - Primary Fusion MPT SCSI initiator IO start routine. | 1305 | * mptscsih_qcmd - Primary Fusion MPT SCSI initiator IO start routine. |
1306 | * @SCpnt: Pointer to scsi_cmnd structure | 1306 | * @SCpnt: Pointer to scsi_cmnd structure |
1307 | * @done: Pointer SCSI mid-layer IO completion function | ||
1308 | * | 1307 | * |
1309 | * (linux scsi_host_template.queuecommand routine) | 1308 | * (linux scsi_host_template.queuecommand routine) |
1310 | * This is the primary SCSI IO start routine. Create a MPI SCSIIORequest | 1309 | * This is the primary SCSI IO start routine. Create a MPI SCSIIORequest |
@@ -1313,7 +1312,7 @@ int mptscsih_show_info(struct seq_file *m, struct Scsi_Host *host) | |||
1313 | * Returns 0. (rtn value discarded by linux scsi mid-layer) | 1312 | * Returns 0. (rtn value discarded by linux scsi mid-layer) |
1314 | */ | 1313 | */ |
1315 | int | 1314 | int |
1316 | mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *)) | 1315 | mptscsih_qcmd(struct scsi_cmnd *SCpnt) |
1317 | { | 1316 | { |
1318 | MPT_SCSI_HOST *hd; | 1317 | MPT_SCSI_HOST *hd; |
1319 | MPT_FRAME_HDR *mf; | 1318 | MPT_FRAME_HDR *mf; |
@@ -1329,10 +1328,9 @@ mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *)) | |||
1329 | 1328 | ||
1330 | hd = shost_priv(SCpnt->device->host); | 1329 | hd = shost_priv(SCpnt->device->host); |
1331 | ioc = hd->ioc; | 1330 | ioc = hd->ioc; |
1332 | SCpnt->scsi_done = done; | ||
1333 | 1331 | ||
1334 | dmfprintk(ioc, printk(MYIOC_s_DEBUG_FMT "qcmd: SCpnt=%p, done()=%p\n", | 1332 | dmfprintk(ioc, printk(MYIOC_s_DEBUG_FMT "qcmd: SCpnt=%p\n", |
1335 | ioc->name, SCpnt, done)); | 1333 | ioc->name, SCpnt)); |
1336 | 1334 | ||
1337 | if (ioc->taskmgmt_quiesce_io) | 1335 | if (ioc->taskmgmt_quiesce_io) |
1338 | return SCSI_MLQUEUE_HOST_BUSY; | 1336 | return SCSI_MLQUEUE_HOST_BUSY; |