[PATCH 096/117] sym53c8xx_2: Convert to the scsi_status union

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

Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +-
drivers/scsi/sym53c8xx_2/sym_glue.h | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index d9a045f9858c..a4976becbff5 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -235,7 +235,7 @@ void sym_set_cam_result_error(struct sym_hcb *np, struct sym_ccb *cp, int resid)
cam_status = sym_xerr_cam_status(DID_ERROR, cp->xerr_status);
}
scsi_set_resid(cmd, resid);
- cmd->result = (drv_status << 24) | (cam_status << 16) | scsi_status;
+ cmd->status.combined = (drv_status << 24) | (cam_status << 16) | scsi_status;
}

static int sym_scatter(struct sym_hcb *np, struct sym_ccb *cp, struct scsi_cmnd *cmd)
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.h b/drivers/scsi/sym53c8xx_2/sym_glue.h
index 7d5c9b988b5b..65468fe6db0d 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.h
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.h
@@ -224,8 +224,8 @@ static inline struct sym_hcb * sym_get_hcb(struct Scsi_Host *host)
static inline void
sym_set_cam_status(struct scsi_cmnd *cmd, int status)
{
- cmd->result &= ~(0xff << 16);
- cmd->result |= (status << 16);
+ cmd->status.combined &= ~(0xff << 16);
+ cmd->status.combined |= (status << 16);
}

/*
@@ -234,7 +234,7 @@ sym_set_cam_status(struct scsi_cmnd *cmd, int status)
static inline int
sym_get_cam_status(struct scsi_cmnd *cmd)
{
- return host_byte(cmd->result);
+ return host_byte(cmd->status);
}

/*
@@ -243,7 +243,7 @@ sym_get_cam_status(struct scsi_cmnd *cmd)
static inline void sym_set_cam_result_ok(struct sym_ccb *cp, struct scsi_cmnd *cmd, int resid)
{
scsi_set_resid(cmd, resid);
- cmd->result = (DID_OK << 16) | (cp->ssss_status & 0x7f);
+ cmd->status.combined = (DID_OK << 16) | (cp->ssss_status & 0x7f);
}
void sym_set_cam_result_error(struct sym_hcb *np, struct sym_ccb *cp, int resid);