[PATCH 071/117] mvumi: Convert to the scsi_status union

Bart Van Assche
2021-04-20T00:10:33Z

drivers/scsi/mvumi.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index 9d5743627604..e9f2d81404cf 100644
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -1303,25 +1303,25 @@ static void mvumi_complete_cmd(struct mvumi_hba *mhba, struct mvumi_cmd *cmd,
struct scsi_cmnd *scmd = cmd->scmd;

cmd->scmd->SCp.ptr = NULL;
- scmd->result = ob_frame->req_status;
+ scmd->status.combined = ob_frame->req_status;

switch (ob_frame->req_status) {
case SAM_STAT_GOOD:
- scmd->result |= DID_OK << 16;
+ scmd->status.combined |= DID_OK << 16;
break;
case SAM_STAT_BUSY:
- scmd->result |= DID_BUS_BUSY << 16;
+ scmd->status.combined |= DID_BUS_BUSY << 16;
break;
case SAM_STAT_CHECK_CONDITION:
- scmd->result |= (DID_OK << 16);
+ scmd->status.combined |= (DID_OK << 16);
if (ob_frame->rsp_flag & CL_RSP_FLAG_SENSEDATA) {
memcpy(cmd->scmd->sense_buffer, ob_frame->payload,
sizeof(struct mvumi_sense_data));
- scmd->result |= (DRIVER_SENSE << 24);
+ scmd->status.combined |= (DRIVER_SENSE << 24);
}
break;
default:
- scmd->result |= (DRIVER_INVALID << 24) | (DID_ABORT << 16);
+ scmd->status.combined |= (DRIVER_INVALID << 24) | (DID_ABORT << 16);
break;
}

@@ -2068,7 +2068,7 @@ static unsigned char mvumi_build_frame(struct mvumi_hba *mhba,
return 0;

error:
- scmd->result = (DID_OK << 16) | (DRIVER_SENSE << 24) |
+ scmd->status.combined = (DID_OK << 16) | (DRIVER_SENSE << 24) |
SAM_STAT_CHECK_CONDITION;
scsi_build_sense_buffer(0, scmd->sense_buffer, ILLEGAL_REQUEST, 0x24,
0);
@@ -2090,7 +2090,7 @@ static int mvumi_queue_command(struct Scsi_Host *shost,
spin_lock_irqsave(shost->host_lock, irq_flags);

mhba = (struct mvumi_hba *) shost->hostdata;
- scmd->result = 0;
+ scmd->status.combined = 0;
cmd = mvumi_get_cmd(mhba);
if (unlikely(!cmd)) {
spin_unlock_irqrestore(shost->host_lock, irq_flags);
@@ -2131,7 +2131,7 @@ static enum blk_eh_timer_return mvumi_timed_out(struct scsi_cmnd *scmd)
else
atomic_dec(&mhba->fw_outstanding);

- scmd->result = (DRIVER_INVALID << 24) | (DID_ABORT << 16);
+ scmd->status.combined = (DRIVER_INVALID << 24) | (DID_ABORT << 16);
scmd->SCp.ptr = NULL;
if (scsi_bufflen(scmd)) {
dma_unmap_sg(&mhba->pdev->dev, scsi_sglist(scmd),