tree 289e8979516098c7b970b4666a8a093c30b7977e
parent 2b55cac3d2d9f545c141748d00eae86e2c042ca5
author Christoph Hellwig <[EMAIL PROTECTED]> Mon, 04 Jul 2005 17:48:36 +0200
committer James Bottomley <[EMAIL PROTECTED](none)> Tue, 02 Aug 2005 21:43:46 
-0500

[SCSI] qla1280: use SAM_ constants

Signed-off-by: Christoph Hellwig <[EMAIL PROTECTED]>
Signed-off-by: Thiemo Seufer <[EMAIL PROTECTED]>
Signed-off-by: James Bottomley <[EMAIL PROTECTED]>

 drivers/scsi/qla1280.c |    2 +-
 drivers/scsi/qla1280.h |    8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -4049,7 +4049,7 @@ qla1280_status_entry(struct scsi_qla_hos
                /* Save ISP completion status */
                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) {
                                uint16_t req_sense_length =
                                        le16_to_cpu(pkt->req_sense_length);
diff --git a/drivers/scsi/qla1280.h b/drivers/scsi/qla1280.h
--- a/drivers/scsi/qla1280.h
+++ b/drivers/scsi/qla1280.h
@@ -979,14 +979,6 @@ struct ctio_a64_ret_entry {
 #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.
  */
 #define OF_ENABLE_TAG       BIT_1      /* Tagged queue action enable */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to