[PATCH 107/117] wd719x: Convert to the scsi_status union

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

Cc: Ondrej Zary <linux@zary.sk>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/wd719x.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/wd719x.c b/drivers/scsi/wd719x.c
index edc8a139a60d..6861352dddd3 100644
--- a/drivers/scsi/wd719x.c
+++ b/drivers/scsi/wd719x.c
@@ -199,7 +199,7 @@ static void wd719x_finish_cmd(struct wd719x_scb *scb, int result)
dma_unmap_single(&wd->pdev->dev, cmd->SCp.dma_handle,
SCSI_SENSE_BUFFERSIZE, DMA_FROM_DEVICE);

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

@@ -294,7 +294,7 @@ static int wd719x_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *cmd)
dma_unmap_single(&wd->pdev->dev, scb->phys, sizeof(*scb),
DMA_BIDIRECTIONAL);
out_error:
- cmd->result = DID_ERROR << 16;
+ cmd->status.combined = DID_ERROR << 16;
cmd->scsi_done(cmd);
return 0;
}