From nobody Sun Oct 27 10:59:04 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 4Xbtn45R76z5ZfsC; Sun, 27 Oct 2024 10:59:04 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xbtn44qCDz4nN6; Sun, 27 Oct 2024 10:59:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026744; 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=zg7/CWe0LMso/9Bj5xiHwyLXvpYMFKhMnaytlLXcx+U=; b=ZmlKYA5KAxxhDfdapPYlEdYW88Y4I3a1uhjIcM2ItbMJrBYG34rvXoO9KIkesR/q4ACyNV et1y+2dwCyNBOiFxjCRX4RAXCMUgcGt/IkQNxS9PLrUI0DhHtq7VztjpuQHB1wznzcBrfx zDRb/8t8PMUIYbNoXrvmxhGmMCVQtkt0U4Bh7vLUPq4DLtByMVizk694reJ6ouO1DxpaDi jQKDiNjbIv3M4jYbZDpJMeZT5C0cac6+ejeBviu/0wqWmpEGAwougJPM3ZTHUHZoi25OoY 71Jt/rdJdrwd35dR06sTUkPW3kMihBNK7oSBQw1bic2/jkHPZUGTRHo/x5Sstg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026744; 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=zg7/CWe0LMso/9Bj5xiHwyLXvpYMFKhMnaytlLXcx+U=; b=jSaCfhh/T/m8MPZFYw/mgNKAdbPJQMVrCvzvBFEuHpouBjTgwDoe0JbVQxEsZU5Z7YM0PQ FVCbLH6v/Ps95R3YBuhhJme2X0mRiSwhm73ya2Dt8jp2XaCw51rzOA7OEIJPKY0zaylJWq TJiMHLmen9zo6XY/lXRUqUSxfaYnh6a3F0Tl+ONni9wmsCFTYwFMW4cxJa53EKDXhr3UYh yKlpg3Kl5yfjyH9dtdXb5a55cbE8deVbXZsUPdj4CKOX3m7Sld/ZO6Nxgd9pXTYBEg38bm 61SlNnK+2JsFpOth/Ejty+AnuxrVVGD9BWQ7AWjqtGngeYoQu1n9rGR8zRGoYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730026744; a=rsa-sha256; cv=none; b=Ks75pCFf3sgAS0GCAHYq1QSY6JPoZinBcol1vhftRqovXG4Xzz0QGRWEZUKC0FBHYVhNtx NN3DZ2Or51ugVo/o6v0i/C9vFPs28Qxlyvl3mHXyVt/C2uigBuI1Vm7aQU2olmvrXYxqMA ewyu73YlnogGl/t/OxaHxmaulH+m0hGFxmWRvSLw2agPJzQKo5vyvtPg7Pmr/W8xIe/4Ck ZZnDzLT895B/aWzxoXH/k65hOki562qP+HpSFJkHjx995n9z6vubc8LRePv7JZjl5ax9f6 4zriEzuH8NSJ8OR9ZT/p1SUuXN3ByaFykYYgRQEZj9AKPbQFbwBrmaYvAPmzJQ== 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 4Xbtn44DpLzr9l; Sun, 27 Oct 2024 10:59:04 +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 49RAx4x4008981; Sun, 27 Oct 2024 10:59:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RAx4Y3008978; Sun, 27 Oct 2024 10:59:04 GMT (envelope-from git) Date: Sun, 27 Oct 2024 10:59:04 GMT Message-Id: <202410271059.49RAx4Y3008978@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: 3ecf2aa39a5a - stable/13 - Fix enum warning in ath_hal's ar9002 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/13 X-Git-Reftype: branch X-Git-Commit: 3ecf2aa39a5a3fc32012d4cfc3da45a97ce94c91 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3ecf2aa39a5a3fc32012d4cfc3da45a97ce94c91 commit 3ecf2aa39a5a3fc32012d4cfc3da45a97ce94c91 Author: Dimitry Andric AuthorDate: 2024-07-31 09:43:50 +0000 Commit: Dimitry Andric CommitDate: 2024-10-27 10:58:36 +0000 Fix enum warning in ath_hal's ar9002 This fixes a clang 19 warning: sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c:57:32: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_ANT_SETTING') [-Werror,-Wenum-compare] 57 | (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { | ~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~ The `ah_diversity` field of `struct ath_hal_5212` is of type `HAL_BOOL`, not the enum type `HAL_ANT_SETTING`. In other code, `ah_diversity` is set to `AH_TRUE` whenever the related field `ah_antControl` is set to `HAL_ANT_VARIABLE`. It is not entirely clear to me what the intended statement is here: the test as it is written now compares the enum value 0 to `ah_diversity`, so in effect it enables the following block whenever `ah_diversity` is `AH_TRUE`. Write it like that, to avoid the compiler warning. MFC after: 3 days (cherry picked from commit 36d486cc2ecdb9c290dba65bd5668b7e50d0d822) --- sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c index 01a224cbbfe9..fb2700771ffa 100644 --- a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c +++ b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c @@ -54,7 +54,7 @@ ar9285BTCoexAntennaDiversity(struct ath_hal *ah) !! (ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE)); if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ALLOW) || - (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { + (AH5212(ah)->ah_diversity == AH_TRUE)) { if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE) && (AH5212(ah)->ah_antControl == HAL_ANT_VARIABLE)) { /* Enable antenna diversity */