1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 00d339c361fc..711fcb5cec87 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -1896,7 +1896,7 @@ mptsas_slave_alloc(struct scsi_device *sdev)
 }
 
 static int
-mptsas_qcmd_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
+mptsas_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *SCpnt)
 {
         MPT_SCSI_HOST   *hd;
         MPT_ADAPTER     *ioc;
@@ -1904,11 +1904,11 @@ mptsas_qcmd_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
 
         if (!vdevice || !vdevice->vtarget || vdevice->vtarget->deleted) {
                 SCpnt->result = DID_NO_CONNECT << 16;
-                done(SCpnt);
+                SCpnt->scsi_done(SCpnt);
                 return 0;
         }
 
-        hd = shost_priv(SCpnt->device->host);
+        hd = shost_priv(shost);
         ioc = hd->ioc;
 
         if (ioc->sas_discovery_quiesce_io)
@@ -1917,11 +1917,9 @@ mptsas_qcmd_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
         if (ioc->debug_level & MPT_DEBUG_SCSI)
                 scsi_print_command(SCpnt);
 
-        return mptscsih_qcmd(SCpnt,done);
+        return mptscsih_qcmd(SCpnt);
 }
 
-static DEF_SCSI_QCMD(mptsas_qcmd)
-
 /**
  *      mptsas_mptsas_eh_timed_out - resets the scsi_cmnd timeout
  *              if the device under question is currently in the