[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>

2 files changed, 9 insertions, 9 deletions

diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index 5ff8261c5d67..356ad268de6d 100644
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -1480,7 +1480,7 @@ mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha , void *piomb)
                         ",param = %d \n", param));
                 if (param == 0) {
                         ts->resp = SAS_TASK_COMPLETE;
-                        ts->stat = SAM_GOOD;
+                        ts->stat = SAM_STAT_GOOD;
                 } else {
                         ts->resp = SAS_TASK_COMPLETE;
                         ts->stat = SAS_PROTO_RESPONSE;
@@ -1909,7 +1909,7 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
                 PM8001_IO_DBG(pm8001_ha, pm8001_printk("IO_SUCCESS\n"));
                 if (param == 0) {
                         ts->resp = SAS_TASK_COMPLETE;
-                        ts->stat = SAM_GOOD;
+                        ts->stat = SAM_STAT_GOOD;
                 } else {
                         u8 len;
                         ts->resp = SAS_TASK_COMPLETE;
@@ -2450,7 +2450,7 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
         case IO_SUCCESS:
                 PM8001_IO_DBG(pm8001_ha, pm8001_printk("IO_SUCCESS\n"));
                 ts->resp = SAS_TASK_COMPLETE;
-                ts->stat = SAM_GOOD;
+                ts->stat = SAM_STAT_GOOD;
         if (pm8001_dev)
                         pm8001_dev->running_req--;
                 break;
@@ -2479,19 +2479,19 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
                 PM8001_IO_DBG(pm8001_ha,
                         pm8001_printk("IO_ERROR_HW_TIMEOUT\n"));
                 ts->resp = SAS_TASK_COMPLETE;
-                ts->stat = SAM_BUSY;
+                ts->stat = SAM_STAT_BUSY;
                 break;
         case IO_XFER_ERROR_BREAK:
                 PM8001_IO_DBG(pm8001_ha,
                         pm8001_printk("IO_XFER_ERROR_BREAK\n"));
                 ts->resp = SAS_TASK_COMPLETE;
-                ts->stat = SAM_BUSY;
+                ts->stat = SAM_STAT_BUSY;
                 break;
         case IO_XFER_ERROR_PHY_NOT_READY:
                 PM8001_IO_DBG(pm8001_ha,
                         pm8001_printk("IO_XFER_ERROR_PHY_NOT_READY\n"));
                 ts->resp = SAS_TASK_COMPLETE;
-                ts->stat = SAM_BUSY;
+                ts->stat = SAM_STAT_BUSY;
                 break;
         case IO_OPEN_CNX_ERROR_PROTOCOL_NOT_SUPPORTED:
                 PM8001_IO_DBG(pm8001_ha,
@@ -3260,7 +3260,7 @@ mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)
         case IO_SUCCESS:
                 PM8001_EH_DBG(pm8001_ha, pm8001_printk("IO_SUCCESS\n"));
                 ts->resp = SAS_TASK_COMPLETE;
-                ts->stat = SAM_GOOD;
+                ts->stat = SAM_STAT_GOOD;
                 break;
         case IO_NOT_VALID:
                 PM8001_EH_DBG(pm8001_ha, pm8001_printk("IO_NOT_VALID\n"));
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,
                 }
 
                 if (task->task_status.resp == SAS_TASK_COMPLETE &&
-                        task->task_status.stat == SAM_GOOD) {
+                        task->task_status.stat == SAM_STAT_GOOD) {
                         res = TMF_RESP_FUNC_COMPLETE;
                         break;
                 }
@@ -853,7 +853,7 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha,
                 }
 
                 if (task->task_status.resp == SAS_TASK_COMPLETE &&
-                        task->task_status.stat == SAM_GOOD) {
+                        task->task_status.stat == SAM_STAT_GOOD) {
                         res = TMF_RESP_FUNC_COMPLETE;
                         break;