Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[GitHub/LineageOS/android_kernel_samsung_universal7580.git] / drivers / scsi / pm8001 / pm8001_hwi.c

diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index e81efac25fa42dbce5ca91c398ac8e10ed71a560..58d1134935ef6860ec0087d549b4b399886db2de 100644 (file)
--- 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"));