From nobody Thu May 12 12:56:23 2022 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 D178A1AD9ECE; Thu, 12 May 2022 12:56:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KzWxM52Bnz4XQw; Thu, 12 May 2022 12:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652360183; 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=2QnDlytcSdOP1AdNmj72SNNf/sH+uOc27YyFd8RQL3U=; b=PmwnAe0qrD+xFpUP9VnFTrLyVdnfzJt+kgOALgrx4T4200nYStCLVd3KFL4j+16CpUb4Pe tZrvNfidaxF43fV7PK9wrJ92eh4NglMpirCUm4jEXqnQvg8k8jIBrGLfm3mIkbZuU0ia1l cDvtp+bC7V9V4HUvtcX0ybDnGJqvE80fz47IWLIaKIeTCxIZn34eow8zFTu99TZvihl2wr uUhC5k9s/PiZ+Y6vQ8JIXHrzQwNhOUAvozVauBxDtBXtHDvxGiGEFqR/4WrmDTmRTWyv12 dLszl5BBhIQ0iBZheHwfmxvv5cRh1NxIyBklv19MfTFVX7/Lv4rT+XTvzmQYaw== 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 83CB266A4; Thu, 12 May 2022 12:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24CCuN26002689; Thu, 12 May 2022 12:56:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24CCuNfi002688; Thu, 12 May 2022 12:56:23 GMT (envelope-from git) Date: Thu, 12 May 2022 12:56:23 GMT Message-Id: <202205121256.24CCuNfi002688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7bb21369905a - stable/13 - bwn: eliminate dead writes in BWN_GPL_PHY 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7bb21369905af0136102fd5dcd0f0b8577181a01 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652360183; 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=2QnDlytcSdOP1AdNmj72SNNf/sH+uOc27YyFd8RQL3U=; b=AhUa0Bn/7FjG73psWMLQC4pr9T1xqDISPQuce8igDvDj6hoflk3F2pUPiojtJhRnFaa3W9 ebI7S/JOFU6Pa0EOnTANBcfvHTgr0HwAA83Yu9ITjcdTDM1ahWGHyM/0FOKu29ukutPkj0 yzpfQOwVsn78cJGhwSRz7Ueijn57FdtNzbt5m+koG/KP/i5LUkB1iqrpqoUDADAYFUtow7 973afM8Omj1eFDM6LhCdEB72voz4JvsIrSncSIPA0HTDRZs+/sqDlXghpOqknwj/cCgV3m btJHU0PT7ZlH71kcPy3UwQ0qVF6m5g8CiHSIVeAFKHXn+BLkxfy92msqbsKdhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652360183; a=rsa-sha256; cv=none; b=xeSm4kpMazz9GI5Uc5uzGMvqc4ay3ODeYi9c94IJAe0PcsnEFYkNm1KaEEC9tkjApQwRb+ BnVa2ZDFXl/QQ6Y1xWx0HeGppxrj+4rmNoU+e56vvf6fBihpvu8fTn2J3odH9/be3Oir7N gPnCkR8XSXSxaQb+3/WN/eyl5idzUNLvGVq1KBwGYZZny7fSiHPRmtQbrbASLFlNSIX2SZ n0SwbITMsK4+vymdfgyLoa/jwyvTSVFW29oaE4Sd0sQgNPk1O033IgjdFlFlXat7w3Rrll 52Im+x1ZYbisa2yXSH/pSGMWGiyWbR0d7Y/7NDw2YKXz/W+UNl9+mrmh5acFTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7bb21369905af0136102fd5dcd0f0b8577181a01 commit 7bb21369905af0136102fd5dcd0f0b8577181a01 Author: Greg V AuthorDate: 2022-05-04 13:32:59 +0000 Commit: Mark Johnston CommitDate: 2022-05-12 12:56:04 +0000 bwn: eliminate dead writes in BWN_GPL_PHY This fixes the newly Werror'ed useless write warnings with options BWN_GPL_PHY. Reviewed by: markj (cherry picked from commit 12905b7d50289633a58caf34ba77ff318ba4f0c2) --- sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c | 4 ---- sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c index f93b7af26877..6b47a5990d3b 100644 --- a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c +++ b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c @@ -6070,7 +6070,6 @@ bwn_nphy_op_recalc_txpower(struct bwn_mac *mac, bool ignore_tssi) struct bwn_softc *sc = mac->mac_sc; struct bwn_ppr *ppr = &nphy->tx_pwr_max_ppr; uint8_t max; /* qdBm */ - bool tx_pwr_state; if (nphy->tx_pwr_last_recalc_freq == bwn_get_centre_freq(mac) && nphy->tx_pwr_last_recalc_limit == phy->txpower) @@ -6108,7 +6107,6 @@ bwn_nphy_op_recalc_txpower(struct bwn_mac *mac, bool ignore_tssi) bwn_ppr_apply_min(mac, ppr, INT_TO_Q52(8)); /* Apply */ - tx_pwr_state = nphy->txpwrctrl; bwn_mac_suspend(mac); bwn_nphy_tx_power_ctl_setup(mac); if (bhnd_get_hwrev(sc->sc_dev) == 11 || bhnd_get_hwrev(sc->sc_dev) == 12) { @@ -6214,7 +6212,6 @@ static int bwn_phy_initn(struct bwn_mac *mac) struct bwn_nphy_txgains target; int error; uint16_t tmp; - bwn_band_t tmp2; bool do_rssi_cal; uint16_t clip[2]; @@ -6308,7 +6305,6 @@ static int bwn_phy_initn(struct bwn_mac *mac) BWN_PHY_WRITE(mac, BWN_NPHY_DUP40_BL, 0x9A4); } - tmp2 = bwn_current_band(mac); if (bwn_nphy_ipa(mac)) { BWN_PHY_SET(mac, BWN_NPHY_PAPD_EN0, 0x1); BWN_PHY_SETMASK(mac, BWN_NPHY_EPS_TABLE_ADJ0, 0x007F, diff --git a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.c b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.c index b59271f65933..c1fc199b75d4 100644 --- a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.c +++ b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.c @@ -3454,10 +3454,15 @@ void bwn_ntab_read_bulk(struct bwn_mac *mac, uint32_t offset, void bwn_ntab_write(struct bwn_mac *mac, uint32_t offset, uint32_t value) { - uint32_t type, orig; + uint32_t type; +#ifdef INVARIANTS + uint32_t orig; +#endif type = offset & BWN_NTAB_TYPEMASK; +#ifdef INVARIANTS orig = offset; +#endif offset &= 0xFFFF; switch (type) { @@ -3494,12 +3499,16 @@ void bwn_ntab_write_bulk(struct bwn_mac *mac, uint32_t offset, { struct bwn_softc *sc = mac->mac_sc; uint32_t type, value; +#ifdef INVARIANTS uint32_t orig; +#endif const uint8_t *data = _data; unsigned int i; type = offset & BWN_NTAB_TYPEMASK; +#ifdef INVARIANTS orig = offset; +#endif offset &= ~BWN_NTAB_TYPEMASK; KASSERT(offset <= 0xFFFF, ("%s: invalid offset (%d)\n", __func__, offset));