Commit d6db3e8d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley

[SCSI] qla1280: use SAM_ constants

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarThiemo Seufer <ths@linux-mips.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 2b55cac3
...@@ -4049,7 +4049,7 @@ qla1280_status_entry(struct scsi_qla_host *ha, struct response *pkt, ...@@ -4049,7 +4049,7 @@ qla1280_status_entry(struct scsi_qla_host *ha, struct response *pkt,
/* Save ISP completion status */ /* Save ISP completion status */
CMD_RESULT(cmd) = qla1280_return_status(pkt, cmd); CMD_RESULT(cmd) = qla1280_return_status(pkt, cmd);
if (scsi_status & SS_CHECK_CONDITION) { if (scsi_status & SAM_STAT_CHECK_CONDITION) {
if (comp_status != CS_ARS_FAILED) { if (comp_status != CS_ARS_FAILED) {
uint16_t req_sense_length = uint16_t req_sense_length =
le16_to_cpu(pkt->req_sense_length); le16_to_cpu(pkt->req_sense_length);
......
...@@ -978,14 +978,6 @@ struct ctio_a64_ret_entry { ...@@ -978,14 +978,6 @@ struct ctio_a64_ret_entry {
#define CS_UNKNOWN 0x81 /* Driver defined */ #define CS_UNKNOWN 0x81 /* Driver defined */
#define CS_RETRY 0x82 /* Driver defined */ #define CS_RETRY 0x82 /* Driver defined */
/*
* ISP status entry - SCSI status byte bit definitions.
*/
#define SS_CHECK_CONDITION BIT_1
#define SS_CONDITION_MET BIT_2
#define SS_BUSY_CONDITION BIT_3
#define SS_RESERVE_CONFLICT (BIT_4 | BIT_3)
/* /*
* ISP target entries - Option flags bit definitions. * ISP target entries - Option flags bit definitions.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment