[PATCH 106/117] wd33c93: Convert to the scsi_status union

Bart Van Assche
2021-04-20T02:14:33Z

Cc: Hannes Reinecke <hare@suse.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/wd33c93.c | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index a23277bb870e..a4efe6fcb982 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -381,7 +381,7 @@ wd33c93_queuecommand_lck(struct scsi_cmnd *cmd,
*/
cmd->host_scribble = NULL;
cmd->scsi_done = done;
- cmd->result = 0;
+ cmd->status.combined = 0;

/* We use the Scsi_Pointer structure that's included with each command
* as a scratchpad (as it's intended to be used!). The handy thing about
@@ -853,7 +853,7 @@ wd33c93_intr(struct Scsi_Host *instance)
hostdata->selecting = NULL;
}

- cmd->result = DID_NO_CONNECT << 16;
+ cmd->status.combined = DID_NO_CONNECT << 16;
hostdata->busy[cmd->device->id] &= ~(1 << (cmd->device->lun & 0xff));
hostdata->state = S_UNCONNECTED;
cmd->scsi_done(cmd);
@@ -1177,11 +1177,10 @@ wd33c93_intr(struct Scsi_Host *instance)
cmd->SCp.Status = lun;
if (cmd->cmnd[0] == REQUEST_SENSE
&& cmd->SCp.Status != SAM_STAT_GOOD)
- cmd->result =
- (cmd->
- result & 0x00ffff) | (DID_ERROR << 16);
+ cmd->status.combined =
+ (cmd->status.combined & 0x00ffff) | (DID_ERROR << 16);
else
- cmd->result =
+ cmd->status.combined =
cmd->SCp.Status | (cmd->SCp.Message << 8);
cmd->scsi_done(cmd);

@@ -1263,10 +1262,10 @@ wd33c93_intr(struct Scsi_Host *instance)
hostdata->busy[cmd->device->id] &= ~(1 << (cmd->device->lun & 0xff));
hostdata->state = S_UNCONNECTED;
if (cmd->cmnd[0] == REQUEST_SENSE && cmd->SCp.Status != SAM_STAT_GOOD)
- cmd->result =
- (cmd->result & 0x00ffff) | (DID_ERROR << 16);
+ cmd->status.combined =
+ (cmd->status.combined & 0x00ffff) | (DID_ERROR << 16);
else
- cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8);
+ cmd->status.combined = cmd->SCp.Status | (cmd->SCp.Message << 8);
cmd->scsi_done(cmd);

/* We are no longer connected to a target - check to see if
@@ -1297,11 +1296,10 @@ wd33c93_intr(struct Scsi_Host *instance)
DB(DB_INTR, printk(":%d", cmd->SCp.Status))
if (cmd->cmnd[0] == REQUEST_SENSE
&& cmd->SCp.Status != SAM_STAT_GOOD)
- cmd->result =
- (cmd->
- result & 0x00ffff) | (DID_ERROR << 16);
+ cmd->status.combined =
+ (cmd->status.combined & 0x00ffff) | (DID_ERROR << 16);
else
- cmd->result =
+ cmd->status.combined =
cmd->SCp.Status | (cmd->SCp.Message << 8);
cmd->scsi_done(cmd);
break;
@@ -1593,7 +1591,7 @@ wd33c93_host_reset(struct scsi_cmnd * SCpnt)
hostdata->outgoing_len = 0;

reset_wd33c93(instance);
- SCpnt->result = DID_RESET << 16;
+ SCpnt->status.combined = DID_RESET << 16;
enable_irq(instance->irq);
spin_unlock_irq(instance->host_lock);
return SUCCESS;
@@ -1628,7 +1626,7 @@ wd33c93_abort(struct scsi_cmnd * cmd)
hostdata->input_Q =
(struct scsi_cmnd *) cmd->host_scribble;
cmd->host_scribble = NULL;
- cmd->result = DID_ABORT << 16;
+ cmd->status.combined = DID_ABORT << 16;
printk
("scsi%d: Abort - removing command from input_Q. ",
instance->host_no);
@@ -1702,7 +1700,7 @@ wd33c93_abort(struct scsi_cmnd * cmd)
hostdata->busy[cmd->device->id] &= ~(1 << (cmd->device->lun & 0xff));
hostdata->connected = NULL;
hostdata->state = S_UNCONNECTED;
- cmd->result = DID_ABORT << 16;
+ cmd->status.combined = DID_ABORT << 16;

/* sti();*/
wd33c93_execute(instance);