From nobody Sun Aug 04 10:23:22 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WcFyf70rfz5SYTD; Sun, 04 Aug 2024 10:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WcFyf5Jwsz4BPB; Sun, 4 Aug 2024 10:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722767002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cV/jcPWc9fxh+89lHvK5doB6h/Qeexzrg8IV36yVvBE=; b=EHewHolY44e4nCen8tOjd2My4cJJuIFpy9sXJPUEKLoNSxDdVEI8X6RlbRnAtF/Fe4iQy0 R47xNlZ8uFhcacXGxhcYoaGYf8a5i5A33F1sztsxcmcahwVa/fUAiGZFwgna5loEjFwgGX zByuDN9TaiWNPJr69BKRTbSZ9PJB9ErJdS+NxYwX7m0IXXBQTPPRgi539bOFXvV3ThsULm 3AlyOpn7EbQDNKCsFTh6YlAqcLDoCeDzN/zBY58bGXb2CjhCesrH9ZWz3tT1zcY4770N5P 3e7RCmERVa5BuOqHiCWjZxhrVPe6ug+geJtHuNnpOqiU6l9O4tDtU3lY2akcnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722767002; a=rsa-sha256; cv=none; b=m/latpn31urYiQ8AuUXy5Uh/I95RA8SmRQH2mhm+KTdR8ed/NmunxHjxGPZGC4U6kH2z5f nrMWcFk0js8iUIZbpxXMHrWPr18XVhrvEqYn2Vr/OK2hw8vG9AVqM3SMhA2YEKWHnhJ7i+ LT1S2eoS0fM0I9HhjqRtIdNX/U3oGBHmNgsdixAqTQQ/8qfZkMdErzCkv+QmDq5UExqxaJ 3m/Pk/ChE+0MLgNTDVTC9aX1jb/g1z7Gs2BBY2KWLVResjGJNeuwNOkwR5ltj447Sek7HL u1GZSKp8MEssaEviKmhfvxjCzoKdyvPvxRfpYzMLytmVz68bEr++D36tninUIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722767002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cV/jcPWc9fxh+89lHvK5doB6h/Qeexzrg8IV36yVvBE=; b=rrXk+sxRvlvni3By83+5yv1fkvmDCrPVms+zo6YxB6S4TMHbdHG0laNnI0vwkCk9Ht0umZ 5it3pCNsBAIBoUriL5/DWJm5BUDNwVgUGOMb/hBamlfdG6zSKMxropFGMqMqxK4af4MeXh /Y1ppqkxn3QFbePFPsmkY9zFI0+NHmLqpRE5Q/X+2/qx3PCmKWh9H2v5S5tP4TelwyzsWb HiIdIG1ms/Obwyx96ssNbK/d4fnllNXOc6anFoQKMr6Aay2KRswIc05zAdhdaujwqdCBM4 hfRtWCnhsYvWBNbgy2MNFOyQXvxa7d7KuqXl6WojULFstizRAu/SM/TasXxxSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WcFyf4vWCzsCn; Sun, 4 Aug 2024 10:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 474ANMVX045694; Sun, 4 Aug 2024 10:23:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 474ANM0e045691; Sun, 4 Aug 2024 10:23:22 GMT (envelope-from git) Date: Sun, 4 Aug 2024 10:23:22 GMT Message-Id: <202408041023.474ANM0e045691@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 7ffa2d91fbdf - stable/14 - Fix enum warning in isci List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7ffa2d91fbdf2cc9984c1cfdcb475c783308b7ad Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7ffa2d91fbdf2cc9984c1cfdcb475c783308b7ad commit 7ffa2d91fbdf2cc9984c1cfdcb475c783308b7ad Author: Dimitry Andric AuthorDate: 2024-07-31 11:14:17 +0000 Commit: Dimitry Andric CommitDate: 2024-08-04 10:21:16 +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