diff options
| author | Christoph Hellwig <hch@lst.de> | 2005-07-04 17:48:36 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-08-02 11:43:46 -0500 |
| commit | d6db3e8d5fe3178776d0a0314e612c3f55e55fb4 (patch) | |
| tree | 289e8979516098c7b970b4666a8a093c30b7977e | |
| parent | 2b55cac3d2d9f545c141748d00eae86e2c042ca5 (diff) | |
| download | linux-3.10-d6db3e8d5fe3178776d0a0314e612c3f55e55fb4.tar.gz linux-3.10-d6db3e8d5fe3178776d0a0314e612c3f55e55fb4.tar.bz2 linux-3.10-d6db3e8d5fe3178776d0a0314e612c3f55e55fb4.zip | |
[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>
| -rw-r--r-- | drivers/scsi/qla1280.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/qla1280.h | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index e5354550d76..3732230b2e3 100644 --- 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 1c1cf3a5af0..0d430d63be4 100644 --- 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 */ |