[SCSI] qla1280: use SAM_ constants

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Thiemo Seufer <ths@linux-mips.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index e5354550d7623b7640b66e255ef20af73e229024..3732230b2e3a878486f78929ef370096603c12ad 100644 (file)
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -4049,7 +4049,7 @@ qla1280_status_entry(struct scsi_qla_host *ha, struct response *pkt,
                /* 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
index 1c1cf3a5af032ffe5c2e27f5ff152ce0d08f50ff..0d430d63be40d439444de230ec57833b654d11b3 100644 (file)
--- a/drivers/scsi/qla1280.h
+++ b/drivers/scsi/qla1280.h
@@ -978,14 +978,6 @@ struct ctio_a64_ret_entry {
 #define CS_UNKNOWN          0x81       /* 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.
  */