CVS Update@linux-mips.org: linux

[ths@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ths@ftp.linux-mips.org  05/07/03 18:38:37

Modified files:
        drivers/scsi   : qla1280.c qla1280.h 

Log message:
        qla1280 patchset from hch: qla1280-use-sam-constants.

diff -urN linux/drivers/scsi/qla1280.c linux/drivers/scsi/qla1280.c
--- linux/drivers/scsi/qla1280.c        2005/07/03 17:35:15     1.48
+++ linux/drivers/scsi/qla1280.c        2005/07/03 17:38:37     1.49
@@ -4017,8 +4017,8 @@
        }
 
        /* Target busy */
-       if (scsi_status & SS_BUSY_CONDITION &&
-           scsi_status != SS_RESERVE_CONFLICT) {
+       if (scsi_status & SAM_STAT_BUSY &&
+           scsi_status != SAM_STAT_RESERVATION_CONFLICT) {
                CMD_RESULT(cmd) =
                        DID_BUS_BUSY << 16 | (scsi_status & 0xff);
        } else {
@@ -4026,7 +4026,7 @@
                /* 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 -urN linux/drivers/scsi/qla1280.h linux/drivers/scsi/qla1280.h
--- linux/drivers/scsi/qla1280.h        2005/07/03 17:32:01     1.21
+++ linux/drivers/scsi/qla1280.h        2005/07/03 17:38:37     1.22
@@ -979,14 +979,6 @@
 #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 */