From nobody Sun Aug 04 10:24:08 2024 X-Original-To: dev-commits-src-all@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 4WcFzY2N3Fz5SYWy; Sun, 04 Aug 2024 10:24:09 +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 4WcFzY0K0Zz4DfF; Sun, 4 Aug 2024 10:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722767049; 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=lXjkhAkHpAMTOtCvQQOlWY6RemW1v3xj22NCtY5abak=; b=rKDVBBWRTTDVkzUiQxhyTJupHG0Cg3OadYVBsUH3FZd5k3Pm0E+ws3YRnjj5HNnxYGlu2n 7xwiZkxyQqMUg35Y2AYHx3pW3dH0lSruX7hmj3T39BYtxFjx+GDKgAlUTf0efAT8PUtbsB geOdQrqZN5tBA9JyGipgzHfHrd58G6cvUENiytPd3/wAg3vEnV7RpFpLruwLKeDuK9jaD8 6NRYSk2heydpfpX7BquVtWntES0s88BVthqpaEtryq3mI3f3zn1WtNfgBOTgfutvqc5PhU x8JsSaJ/x5Mjj/v4YaXbQRsqQ54Fw1ySdceMJCztaefI5vsKi4y/iGlpXcuWgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722767049; a=rsa-sha256; cv=none; b=v+GG25ADVeGN0XV5xI4x5Taz6OH4GrXCASn7yyrBW8Lxz+fDCSMNe4KhUX0ci8hdYFnBqn dWqPRfVVrW+T5cXMNzZnyzL2kQAGT4z7tBnccHePfi6DTMfhEI32PF06z/EU7EuFcP6qie CE0Yy36/fYaAeOOFWYfbDbtZNK0TiYGUmq+XrYVCCE95Zai91OXMM/wtKempLKJ/rViUIz /KROQ1qfNwSL08/vIbJ/aMKtU4Q/7BTIT7ivfxS346k6IW4miTlxN2ZkkAl53xT3oGJyJW W9YiAZmpggqEj0NSbryZ7gHYdFEAmwHiS+g+dzPfljde9a5XCd4FNRvSIIakQg== 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=1722767049; 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=lXjkhAkHpAMTOtCvQQOlWY6RemW1v3xj22NCtY5abak=; b=Y16p/1ywCBV19fApcPJbFyJYvmwSI1Oj3vcnQsaO2ZbhwXDoEWuKsrxShqwjMFtBKenUrC Fp4/rc8V7qnWALJZaReOk+d796AUxohF20qei+ctvVGeinGg3ZqpDb2+DSUjhLp2d5Zfyk 5LHZ5cASlsl6QAddAIVWZ1NElrygEuIBJe1rsjsD2mzdiFyXETkAxedcUZLux3hGq29EWI P3QZq5XqEG/pUp7JBebzLp9E5SNUheDlYIZNzrMeoXNYwnVl5aBOxf++6niOxd7NyOIpfc W8FaVclYDDzcf/xO6hgqiKHgIrexo38gTTUg8P1dlF1MTiHFoFiWgVzP/zwTYA== 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 4WcFzX72pczrhj; Sun, 4 Aug 2024 10:24:08 +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 474AO8qV046131; Sun, 4 Aug 2024 10:24:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 474AO8YD046128; Sun, 4 Aug 2024 10:24:08 GMT (envelope-from git) Date: Sun, 4 Aug 2024 10:24:08 GMT Message-Id: <202408041024.474AO8YD046128@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: 1a00a88a379c - stable/13 - Fix enum warning in isci List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 1a00a88a379c23825c5f91ff4d0a87a7ed72ca48 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1a00a88a379c23825c5f91ff4d0a87a7ed72ca48 commit 1a00a88a379c23825c5f91ff4d0a87a7ed72ca48 Author: Dimitry Andric AuthorDate: 2024-07-31 11:14:17 +0000 Commit: Dimitry Andric 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