[PATCH 044/117] esp_scsi: Convert to the scsi_status union

Bart Van Assche
2021-04-20T00:09:57Z

drivers/scsi/esp_scsi.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index 342535ac0570..694d98a20b5f 100644
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -905,7 +905,7 @@ static void esp_cmd_is_done(struct esp *esp, struct esp_cmd_entry *ent,
esp->active_cmd = NULL;
esp_unmap_dma(esp, cmd);
esp_free_lun_tag(ent, dev->hostdata);
- cmd->result = 0;
+ cmd->status.combined = 0;
set_host_byte(cmd, host_byte);
if (host_byte == DID_OK)
set_status_byte(cmd, ent->status);
@@ -922,7 +922,7 @@ static void esp_cmd_is_done(struct esp *esp, struct esp_cmd_entry *ent,
* saw originally. Also, report that we are providing
* the sense data.
*/
- cmd->result = ((DRIVER_SENSE << 24) |
+ cmd->status.combined = ((DRIVER_SENSE << 24) |
(DID_OK << 16) |
(SAM_STAT_CHECK_CONDITION << 0));

@@ -2035,7 +2035,7 @@ static void esp_reset_cleanup_one(struct esp *esp, struct esp_cmd_entry *ent)

esp_unmap_dma(esp, cmd);
esp_free_lun_tag(ent, cmd->device->hostdata);
- cmd->result = DID_RESET << 16;
+ cmd->status.combined = DID_RESET << 16;

if (ent->flags & ESP_CMD_FLAG_AUTOSENSE)
esp_unmap_sense(esp, ent);
@@ -2062,7 +2062,7 @@ static void esp_reset_cleanup(struct esp *esp)
struct scsi_cmnd *cmd = ent->cmd;

list_del(&ent->list);
- cmd->result = DID_RESET << 16;
+ cmd->status.combined = DID_RESET << 16;
cmd->scsi_done(cmd);
esp_put_ent(esp, ent);
}
@@ -2536,7 +2536,7 @@ static int esp_eh_abort_handler(struct scsi_cmnd *cmd)
*/
list_del(&ent->list);

- cmd->result = DID_ABORT << 16;
+ cmd->status.combined = DID_ABORT << 16;
cmd->scsi_done(cmd);

esp_put_ent(esp, ent);