From nobody Thu Sep 4 14:33:14 2025 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 4cHhmC0P1bz667hs; Thu, 04 Sep 2025 14:33:15 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHhmB72k2z3g4p; Thu, 04 Sep 2025 14:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756996395; 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=yUGSqIlaPsQYxaNio7POigHvHIOvfH4puqmV93e6F+0=; b=QXdhFjzVDe3xy/1cH/nVUXx7MAy7i4gj6oCoeOpQ3psofy5J74zGBWxGCpyCKck+xr4+vv qDpmCOKctd1o+wcG6k3KydHUgYLe5D81k/kh9GEpamI2kOuzVy03d1zMakYygyqYBxf/Tz M5qd5F1SOct9JBHKS8iK6A4lR0zPZ8zAtjspjtFdz7qJZO1nFdshN6ygdzXoVGrdVBViSI jniJYtlekmZgB6TSog338qfGQj35JJeqmyPzayUR92CWtxxdnP5CCdbRhVa0ctEwj0ZuW/ GZLOhWlS1HzegZCpBRV2tuVHuMRbI/Jcav9nM0hc0Bqt3QXelJIj4dNt1ubssw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756996395; 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=yUGSqIlaPsQYxaNio7POigHvHIOvfH4puqmV93e6F+0=; b=verQG2hZoU6DzqFZnFTmY9K4Wipd8HcmGeBS3pEhQf++FCKmKy7ehlil7MarXewQt7wdYe Q8vuUVD2msJJPatVBVvqJLS1wtDjlvDFYDmEuYFfj78TTO9FicPqzpjX2AbHObUXApehat FcoxQzQSVz5kbcadE0jrDhETRR1zOdEUe9GbAVLqSxVIN8/jfrcIlSZqzqhccdoYY2fKtg ZI6JXGAdToVPIGi+pmOA07kzZOQiFADWRCXY5h81fZkQu9J7QedUTjZuk3H1JENmVObGnC RmHoUyMfHZ/FNGfVKx/z6YCFX2T4TwUUMrb+ytL0vlAQsSlr+f7YN3uwPz77tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756996395; a=rsa-sha256; cv=none; b=bVYcqMAPpS98HrpyHjMbD7PUKJtIW6b/KrvgJJM2XNMyrn46cankf1CoJWOOAIKFyndV6I 157ReRIJplUkt5DKteI5TtFLUfCL4HzL7QDVkyY9bwbwE8mlhEHuwXqRacsR4jcqGIiiTs c9eZecj5SFDvyNO1kJ7crcitycDATt8grCc6Yw/Z/v2WwYo6D3ao+PJ07TdM67/u55P5TU QXS6wO3lvQvVGi3g8V/zSkh4HmQSNLYNvjFr0M3gdNrM6suzF+KJC4IrhqKQ8h5Aqs39Vg /lCn4P2dZ0fV4YQgW9ZLxta+quw75iSeiPXwEvYCLJxsHgBVq9697oOJDp4bWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cHhmB6cxjz15cj; Thu, 04 Sep 2025 14:33:14 +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 584EXEUp025273; Thu, 4 Sep 2025 14:33:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584EXEcD025270; Thu, 4 Sep 2025 14:33:14 GMT (envelope-from git) Date: Thu, 4 Sep 2025 14:33:14 GMT Message-Id: <202509041433.584EXEcD025270@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e2761a8567f3 - main - rtw89: Remove an unneeded __DECONST 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2761a8567f3bd93e4c363c2a1360eb89dd5f85b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e2761a8567f3bd93e4c363c2a1360eb89dd5f85b commit e2761a8567f3bd93e4c363c2a1360eb89dd5f85b Author: John Baldwin AuthorDate: 2025-09-04 14:25:46 +0000 Commit: John Baldwin CommitDate: 2025-09-04 14:30:15 +0000 rtw89: Remove an unneeded __DECONST Originally in e2340276fc73 the function argument was a "const void *data" which we changed to "const int" in FreeBSD. The Linux version simply cast the const void * to (enum rtw89_rf_path) both losing the const and changing the type. When later the function argument became a const union rtw89_fw_element_arg in 5b760eaecd6c3 it seems we tried to undo the older FreeBSD specific part and initially mismerged it leading to the const void *; but when fixing the type we did not undo the __DECONST but did a mechanical copy. Reviewed by: bz Co-authored-by: bz (commit message) Obtained from: CheriBSD Sponsored by: AFRL, DARPA Fixes: 6d67aabd6355 ("rtw89: update Realtek's rtw89 driver.") Differential Revision: https://reviews.freebsd.org/D52359 --- sys/contrib/dev/rtw89/fw.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/contrib/dev/rtw89/fw.c b/sys/contrib/dev/rtw89/fw.c index e360f27c2ade..b4c0f864bc75 100644 --- a/sys/contrib/dev/rtw89/fw.c +++ b/sys/contrib/dev/rtw89/fw.c @@ -908,11 +908,7 @@ int rtw89_build_phy_tbl_from_elm(struct rtw89_dev *rtwdev, case RTW89_FW_ELEMENT_ID_RADIO_B: case RTW89_FW_ELEMENT_ID_RADIO_C: case RTW89_FW_ELEMENT_ID_RADIO_D: -#if defined(__linux__) rf_path = arg.rf_path; -#elif defined(__FreeBSD__) - rf_path = __DECONST(enum rtw89_rf_path, arg.rf_path); -#endif idx = elm->u.reg2.idx; elm_info->rf_radio[idx] = tbl;