Skip to content

Commit

Permalink
[SCSI] qla1280: use SAM_ constants
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Christoph Hellwig authored and James Bottomley committed Aug 2, 2005
1 parent 2b55cac commit d6db3e8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion drivers/scsi/qla1280.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 0 additions & 8 deletions drivers/scsi/qla1280.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down

0 comments on commit d6db3e8

Please sign in to comment.