git: 1a00a88a379c - stable/13 - Fix enum warning in isci

From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Sun, 04 Aug 2024 10:24:08 UTC
The branch stable/13 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=1a00a88a379c23825c5f91ff4d0a87a7ed72ca48

commit 1a00a88a379c23825c5f91ff4d0a87a7ed72ca48
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-07-31 11:14:17 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-08-04 10:22:41 +0000

    Fix enum warning in isci
    
    This fixes a clang 19 warning:
    
        sys/dev/isci/scil/scif_sas_smp_remote_device.c:197:26: error: comparison of different enumeration types ('SCI_IO_STATUS' (aka 'enum _SCI_IO_STATUS') and 'enum _SCI_STATUS') [-Werror,-Wenum-compare]
          197 |    if (completion_status == SCI_FAILURE_RETRY_REQUIRED)
              |        ~~~~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    The `completion_status` variable is of type `SCI_IO_STATUS`, not
    `SCI_STATUS`. In this case, we can seamlessly replace the value with
    `SCI_IO_FAILURE_RETRY_REQUIRED`, which is numerically equal to
    `SCI_FAILURE_RETRY_REQUIRED`.
    
    MFC after:      3 days
    
    (cherry picked from commit 1bd66fac35ec27fa64d6158f82fdcbdc26098679)
---
 sys/dev/isci/scil/scif_sas_smp_remote_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/isci/scil/scif_sas_smp_remote_device.c b/sys/dev/isci/scil/scif_sas_smp_remote_device.c
index d6055adc13f9..c72402f66889 100644
--- a/sys/dev/isci/scil/scif_sas_smp_remote_device.c
+++ b/sys/dev/isci/scil/scif_sas_smp_remote_device.c
@@ -194,7 +194,7 @@ SCI_STATUS scif_sas_smp_remote_device_decode_smp_response(
 
    //if Core set the status of this io to be RETRY_REQUIRED, we should
    //retry the IO without even decode the response.
-   if (completion_status == SCI_FAILURE_RETRY_REQUIRED)
+   if (completion_status == SCI_IO_FAILURE_RETRY_REQUIRED)
    {
       scif_sas_smp_remote_device_continue_current_activity(
          fw_device, fw_request, SCI_FAILURE_RETRY_REQUIRED