An explanation of the purpose of this patch is available in the patch "scsi: Introduce the scsi_status union". Cc: Don Brace <don.brace@xxxxxxxxxxxxx> Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx> --- drivers/scsi/smartpqi/smartpqi_init.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index 25c0409e98df..55bdc2c180a8 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -3001,7 +3001,7 @@ static void pqi_process_raid_io_error(struct pqi_io_request *io_request) sense_data_length); } - scmd->result = scsi_status; + scmd->status.combined = scsi_status; set_host_byte(scmd, host_byte); } @@ -3091,7 +3091,7 @@ static void pqi_process_aio_io_error(struct pqi_io_request *io_request) scsi_build_sense_buffer(0, scmd->sense_buffer, HARDWARE_ERROR, 0x3e, 0x1); - scmd->result = scsi_status; + scmd->status.combined = scsi_status; set_host_byte(scmd, host_byte); } @@ -3188,7 +3188,7 @@ static int pqi_process_io_intr(struct pqi_ctrl_info *ctrl_info, struct pqi_queue case PQI_RESPONSE_IU_RAID_PATH_IO_SUCCESS: case PQI_RESPONSE_IU_AIO_PATH_IO_SUCCESS: if (io_request->scmd) - io_request->scmd->result = 0; + io_request->scmd->status.combined = 0; fallthrough; case PQI_RESPONSE_IU_GENERAL_MANAGEMENT: break; @@ -5333,9 +5333,9 @@ static bool pqi_raid_bypass_retry_needed(struct pqi_io_request *io_request) return false; scmd = io_request->scmd; - if ((scmd->result & 0xff) == SAM_STAT_GOOD) + if ((scmd->status.combined & 0xff) == SAM_STAT_GOOD) return false; - if (host_byte(scmd->result) == DID_NO_CONNECT) + if (host_byte(scmd->status) == DID_NO_CONNECT) return false; device = scmd->device->hostdata; @@ -5719,7 +5719,7 @@ static int pqi_scsi_queue_command(struct Scsi_Host *shost, struct scsi_cmnd *scm * This is necessary because the SML doesn't zero out this field during * error recovery. */ - scmd->result = 0; + scmd->status.combined = 0; hw_queue = pqi_get_hw_queue(ctrl_info, scmd); queue_group = &ctrl_info->queue_groups[hw_queue];