aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pm8001/pm8001_sas.c
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@suse.de>2010-07-27 16:51:13 -0400
committerJames Bottomley <James.Bottomley@suse.de>2010-07-28 10:07:49 -0400
commitdf64d3caab8db6ae17dacd229a03d7689a10c432 (patch)
tree247fe4f9f39b22186e42e7f4687dd62c2690e47b /drivers/scsi/pm8001/pm8001_sas.c
parent653c42d552d0fd0b05485442aed45dd2d62269c0 (diff)
[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>
Diffstat (limited to 'drivers/scsi/pm8001/pm8001_sas.c')
-rw-r--r--drivers/scsi/pm8001/pm8001_sas.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index cd02ceaf67ff..6ae059ebb4bb 100644
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -763,7 +763,7 @@ static int pm8001_exec_internal_tmf_task(struct domain_device *dev,
763 } 763 }
764 764
765 if (task->task_status.resp == SAS_TASK_COMPLETE && 765 if (task->task_status.resp == SAS_TASK_COMPLETE &&
766 task->task_status.stat == SAM_GOOD) { 766 task->task_status.stat == SAM_STAT_GOOD) {
767 res = TMF_RESP_FUNC_COMPLETE; 767 res = TMF_RESP_FUNC_COMPLETE;
768 break; 768 break;
769 } 769 }
@@ -853,7 +853,7 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha,
853 } 853 }
854 854
855 if (task->task_status.resp == SAS_TASK_COMPLETE && 855 if (task->task_status.resp == SAS_TASK_COMPLETE &&
856 task->task_status.stat == SAM_GOOD) { 856 task->task_status.stat == SAM_STAT_GOOD) {
857 res = TMF_RESP_FUNC_COMPLETE; 857 res = TMF_RESP_FUNC_COMPLETE;
858 break; 858 break;
859 859