scsi: qla4xxx: Use standard SAM status definitions

Use standard SAM status definitions and drop the driver-defined ones.

Link: https://lore.kernel.org/r/20210113090500.129644-14-hare@suse.de
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h
index b9142464d3f02b420b5afb06198feed9fcb2fd92..4e1764df0a731fcaae0cc474cd6b95869f2fa463 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_fw.h
+++ b/drivers/scsi/qla4xxx/ql4_fw.h
@@ -1181,7 +1181,6 @@ struct status_entry {
        uint32_t handle;        /* 04-07 */
 
        uint8_t scsiStatus;     /* 08 */
-#define SCSI_CHECK_CONDITION             0x02
 
        uint8_t iscsiFlags;     /* 09 */
 #define ISCSI_FLAG_RESIDUAL_UNDER        0x02

diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index a51910ae95252a40570929931dcb9a471bbb78a5..6f0e77dc2a340827f86946cc22e5be4049c45ebb 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -182,7 +182,7 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha,
 
                cmd->result = DID_OK << 16 | scsi_status;
 
-               if (scsi_status != SCSI_CHECK_CONDITION)
+               if (scsi_status != SAM_STAT_CHECK_CONDITION)
                        break;
 
                /* Copy Sense Data into sense buffer. */