From nobody Wed Jul 31 19:32:38 2024 X-Original-To: dev-commits-src-main@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 4WZ2LG6shYz5RD4g; Wed, 31 Jul 2024 19:32:38 +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 4WZ2LG4Hwtz4YkB; Wed, 31 Jul 2024 19:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722454358; 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=l4GBfYjH0KGWs5hy9VBwvTx/kIbyJcdTnd4y0FjCeyg=; b=IAD/N+rE5x3VRTWaBPT7Fqk/4g5njQzkUbbOJsmne+24mm7pKrLIoAkvPd1FWzdBJXDCa8 2AdaoJNjNXab8jQ1Lm3REK0DBqe4bgnqxW+NxsPeiCuRht4tz8Ehw8Ho6qx5/fVwq7r/B4 mGlw1toMgXkSXbe9iQfYGa0GQp7bzIOKqBQ05GZyh2ROhih/rue4s6Tqv7MVwUBDGLTZT7 zGDiH1PoCHLp+yXkkNDl8ixAah746hC1w6wdfry2qkjk31nyyZIBXKZzPJ+L/PSYeOBP+2 s8x/mYjUKDrVSfJgGlNrOzCy1BiqdArN4OGMNLX/fmcb6QBwHJ/+K6E4vMHY/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722454358; a=rsa-sha256; cv=none; b=BTGTmKdBR8VX/qlEQoxj5HKrfHnZ/N9SfL+XKUzwsfP4ycweNQLEmemxVF9ny3r6TQ+yOf lZ5qH/FLhfWpupaBsTlw/2HikI2yy0xIjXprJk5T7hh3idSJg9I8FZ+Cc7HD8Vsk5bZcgc CmoGYMYXLwJsjmc0w8RRTGFADiWIVJYb0CpBJgBndd6B2LEWmuoVvGUTOi4VB7dJBJj8yJ SGZ4lBHCIlx/Lx58Scl82COLoE3AxGp1+PRCn76euXc22hKDa9kd3Wyu/QJzWh/d2YUxXl 25cVdvMlhWCBhpMdfoscj1X5h6yjO0S473LRb7uAe6jLq75gfCwfwip/cRgnOQ== 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=1722454358; 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=l4GBfYjH0KGWs5hy9VBwvTx/kIbyJcdTnd4y0FjCeyg=; b=LXE9YMAwLizuMxM00Zk5+zXFuDacmSiFSmF9/ViBCJm+nnV2SVSEXGf+6O8nVUsKJnNlhV jS3QE1OPWM6VuCvqeYxs36ib1pOSF8UhD9yIpjaryTO8mdu3i70cPndjnXrljg5NuINauu nsyCA6mpQ2SEY//kbkC5AtTy04sHnLaRT2c5FnbFV+nZOmJ3zSKU4StjFhYXhKBzuOWAVQ NmpRerNEvYeuhsCgla8w5IhvaSaP5f9is2RlVul6Z3tWCm0kUuzPWA5sY43SSnbAn9J5QI +obBvZA3FnrdEADeS1ya4r6UmmE7ZnEPJbGcTRssljY+UCVFVesstNxoZaJ9Qw== 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 4WZ2LG3pW0zDhb; Wed, 31 Jul 2024 19:32:38 +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 46VJWcej094637; Wed, 31 Jul 2024 19:32:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46VJWc0K094634; Wed, 31 Jul 2024 19:32:38 GMT (envelope-from git) Date: Wed, 31 Jul 2024 19:32:38 GMT Message-Id: <202407311932.46VJWc0K094634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 1bd66fac35ec - main - Fix enum warning in isci List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1bd66fac35ec27fa64d6158f82fdcbdc26098679 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1bd66fac35ec27fa64d6158f82fdcbdc26098679 commit 1bd66fac35ec27fa64d6158f82fdcbdc26098679 Author: Dimitry Andric AuthorDate: 2024-07-31 11:14:17 +0000 Commit: Dimitry Andric CommitDate: 2024-07-31 19:31:50 +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 --- 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