[SCSI] Unify SAM_ and SAM_STAT_ macros
We have two separate definitions for identical constants with nearly the same name. One comes from the generic headers in scsi.h; the other is an enum in libsas.h ... it's causing confusion about which one is correct (fortunately they both are). Fix this by eliminating the libsas.h duplicate Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
@ -15,13 +15,13 @@ void sas_ssp_task_response(struct device *dev, struct sas_task *task,
|
||||
else if (iu->datapres == 1)
|
||||
tstat->stat = iu->resp_data[3];
|
||||
else if (iu->datapres == 2) {
|
||||
tstat->stat = SAM_CHECK_COND;
|
||||
tstat->stat = SAM_STAT_CHECK_CONDITION;
|
||||
tstat->buf_valid_size =
|
||||
min_t(int, SAS_STATUS_BUF_SIZE,
|
||||
be32_to_cpu(iu->sense_data_len));
|
||||
memcpy(tstat->buf, iu->sense_data, tstat->buf_valid_size);
|
||||
|
||||
if (iu->status != SAM_CHECK_COND)
|
||||
if (iu->status != SAM_STAT_CHECK_CONDITION)
|
||||
dev_printk(KERN_WARNING, dev,
|
||||
"dev %llx sent sense data, but "
|
||||
"stat(%x) is not CHECK CONDITION\n",
|
||||
@ -30,7 +30,7 @@ void sas_ssp_task_response(struct device *dev, struct sas_task *task,
|
||||
}
|
||||
else
|
||||
/* when datapres contains corrupt/unknown value... */
|
||||
tstat->stat = SAM_CHECK_COND;
|
||||
tstat->stat = SAM_STAT_CHECK_CONDITION;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(sas_ssp_task_response);
|
||||
|
||||
|
Reference in New Issue
Block a user