Merge tag 'acpi-5.14-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / drivers / scsi / mvsas / mv_sas.c

diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index 1acea52..31d1ea5 100644 (file)
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -1314,7 +1314,7 @@ static int mvs_exec_internal_tmf_task(struct domain_device *dev,
                }
 
                if (task->task_status.resp == SAS_TASK_COMPLETE &&
-                   task->task_status.stat == SAM_STAT_GOOD) {
+                   task->task_status.stat == SAS_SAM_STAT_GOOD) {
                        res = TMF_RESP_FUNC_COMPLETE;
                        break;
                }
@@ -1764,7 +1764,7 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags)
        case SAS_PROTOCOL_SSP:
                /* hw says status == 0, datapres == 0 */
                if (rx_desc & RXQ_GOOD) {
-                       tstat->stat = SAM_STAT_GOOD;
+                       tstat->stat = SAS_SAM_STAT_GOOD;
                        tstat->resp = SAS_TASK_COMPLETE;
                }
                /* response frame present */
@@ -1773,12 +1773,12 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags)
                                                sizeof(struct mvs_err_info);
                        sas_ssp_task_response(mvi->dev, task, iu);
                } else
-                       tstat->stat = SAM_STAT_CHECK_CONDITION;
+                       tstat->stat = SAS_SAM_STAT_CHECK_CONDITION;
                break;
 
        case SAS_PROTOCOL_SMP: {
                        struct scatterlist *sg_resp = &task->smp_task.smp_resp;
-                       tstat->stat = SAM_STAT_GOOD;
+                       tstat->stat = SAS_SAM_STAT_GOOD;
                        to = kmap_atomic(sg_page(sg_resp));
                        memcpy(to + sg_resp->offset,
                                slot->response + sizeof(struct mvs_err_info),
@@ -1795,7 +1795,7 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags)
                }
 
        default:
-               tstat->stat = SAM_STAT_CHECK_CONDITION;
+               tstat->stat = SAS_SAM_STAT_CHECK_CONDITION;
                break;
        }
        if (!slot->port->port_attached) {