|
@@ -3515,7 +3515,7 @@ _scsih_eedp_error_handling(struct scsi_cmnd *scmd, u16 ioc_status)
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * _scsih_qcmd_lck - main scsi request entry point
|
|
|
+ * _scsih_qcmd - main scsi request entry point
|
|
|
* @scmd: pointer to scsi command object
|
|
|
* @done: function pointer to be invoked on completion
|
|
|
*
|
|
@@ -3526,9 +3526,9 @@ _scsih_eedp_error_handling(struct scsi_cmnd *scmd, u16 ioc_status)
|
|
|
* SCSI_MLQUEUE_HOST_BUSY if the entire host queue is full
|
|
|
*/
|
|
|
static int
|
|
|
-_scsih_qcmd_lck(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *))
|
|
|
+_scsih_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *scmd)
|
|
|
{
|
|
|
- struct MPT3SAS_ADAPTER *ioc = shost_priv(scmd->device->host);
|
|
|
+ struct MPT3SAS_ADAPTER *ioc = shost_priv(shost);
|
|
|
struct MPT3SAS_DEVICE *sas_device_priv_data;
|
|
|
struct MPT3SAS_TARGET *sas_target_priv_data;
|
|
|
Mpi2SCSIIORequest_t *mpi_request;
|
|
@@ -3541,7 +3541,6 @@ _scsih_qcmd_lck(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *))
|
|
|
scsi_print_command(scmd);
|
|
|
#endif
|
|
|
|
|
|
- scmd->scsi_done = done;
|
|
|
sas_device_priv_data = scmd->device->hostdata;
|
|
|
if (!sas_device_priv_data || !sas_device_priv_data->sas_target) {
|
|
|
scmd->result = DID_NO_CONNECT << 16;
|
|
@@ -3656,8 +3655,6 @@ _scsih_qcmd_lck(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *))
|
|
|
out:
|
|
|
return SCSI_MLQUEUE_HOST_BUSY;
|
|
|
}
|
|
|
-static DEF_SCSI_QCMD(_scsih_qcmd)
|
|
|
-
|
|
|
|
|
|
/**
|
|
|
* _scsih_normalize_sense - normalize descriptor and fixed format sense data
|