scsi: nsp32: Do not set message byte

The message byte always devolves to COMMAND_COMPLETE, so there is no point
in setting it.

Link: https://lore.kernel.org/r/20210427083046.31620-25-hare@suse.de
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 60933ed96e7ffb32e3b48eda9681b9b5abb67e86..bc9d29e5fdbac61c75f928fea8c521ba4d19f0d0 100644 (file)
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -948,7 +948,6 @@ static int nsp32_queuecommand_lck(struct scsi_cmnd *SCpnt,
        SCpnt->scsi_done     = done;
        data->CurrentSC      = SCpnt;
        SCpnt->SCp.Status    = SAM_STAT_CHECK_CONDITION;
-       SCpnt->SCp.Message   = 0;
        scsi_set_resid(SCpnt, scsi_bufflen(SCpnt));
 
        SCpnt->SCp.ptr              = (char *)scsi_sglist(SCpnt);
@@ -1690,12 +1689,10 @@ static int nsp32_busfree_occur(struct scsi_cmnd *SCpnt, unsigned short execph)
                nsp32_dbg(NSP32_DEBUG_BUSFREE, "command complete");
 
                SCpnt->SCp.Status  = nsp32_read1(base, SCSI_CSB_IN);
-               SCpnt->SCp.Message = 0;
                nsp32_dbg(NSP32_DEBUG_BUSFREE,
                          "normal end stat=0x%x resid=0x%x\n",
                          SCpnt->SCp.Status, scsi_get_resid(SCpnt));
                SCpnt->result = (DID_OK << 16) |
-                       (SCpnt->SCp.Message << 8) |
                        (SCpnt->SCp.Status << 0);
                nsp32_scsi_done(SCpnt);
                /* All operation is done */
@@ -1703,7 +1700,6 @@ static int nsp32_busfree_occur(struct scsi_cmnd *SCpnt, unsigned short execph)
        } else if (execph & MSGIN_04_VALID) {
                /* MsgIn 04: Disconnect */
                SCpnt->SCp.Status  = nsp32_read1(base, SCSI_CSB_IN);
-               SCpnt->SCp.Message = 4;
 
                nsp32_dbg(NSP32_DEBUG_BUSFREE, "disconnect");
                return TRUE;
@@ -1712,7 +1708,7 @@ static int nsp32_busfree_occur(struct scsi_cmnd *SCpnt, unsigned short execph)
                nsp32_msg(KERN_WARNING, "unexpected bus free occurred");
 
                /* DID_ERROR? */
-               //SCpnt->result   = (DID_OK << 16) | (SCpnt->SCp.Message << 8) | (SCpnt->SCp.Status << 0);
+               //SCpnt->result   = (DID_OK << 16) | (SCpnt->SCp.Status << 0);
                SCpnt->result = DID_ERROR << 16;
                nsp32_scsi_done(SCpnt);
                return TRUE;