From nobody Wed Apr 13 23:09:24 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 550711B406C2; Wed, 13 Apr 2022 23:09:26 +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 4Kdyw46wtbz4ljF; Wed, 13 Apr 2022 23:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891365; 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=WtywVDSEtVUsaEwSXuKzWj6MaUvFPbf/6WWzk7hT5Ek=; b=tHrfK6X64MIju1rT4b3pH5RTCzqDQKuvRPHAVtXgCrR07L4V6Qsqc7U60hnlxSRXDnTJYO 7ZvoRV/twaAm3fDp8SrQsxXgux4nts4vr+TTMM5aJlEAJWfG/BRa+iDyZRCuz561CjtLen mFkuJxcQ82D1KdzclAidEfCLLELfzwxNSyvmW+q5YodHkU4S+1vxJw5jLwiA73jie3rZkO icmrgyttoBW//pTdD7rxG09oQ2fOxCxHNciVVwBbOvy9P6pWKcq2uvtkoS9eMKhwM8hizn utjhEzCb261RCBe34bPfZXYSztELBMvT7EoXSLAz1zHIcTu4YBtBbbCfAnbYzQ== 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 69A3414F7F; Wed, 13 Apr 2022 23:09:24 +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 23DN9Oiq074337; Wed, 13 Apr 2022 23:09:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DN9O6R074336; Wed, 13 Apr 2022 23:09:24 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:09:24 GMT Message-Id: <202204132309.23DN9O6R074336@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: e565fa55e687 - main - sfxge: Use __diagused for variables only used in KASSERT(). 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e565fa55e68757b9abe42cf42e8bf20916546c94 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891365; 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=WtywVDSEtVUsaEwSXuKzWj6MaUvFPbf/6WWzk7hT5Ek=; b=SFSAyAK2i4NjA56VGdsfeHHSftCvX1YAt08aS2oWyYCLj1ugEKaGnLe/AzvUC4oEGT8vhj DpzxgfbmztlOXmljdoDdlBcdxvn8CiO7cMOic7q0L5FZjvqshY/mlbGYbYmHpjfRnJnJiF YfLqLaTBiUxy9o5+IPunhzL62x8fP6VcUUIDnDxMeYXK+lUzO7TkbSkYCD9TlJ9dMRN+yk 31KJIf1myysbDLGIzMyT2V0Re2Kmhrma6PFv4wmptSxkP2HjFDFBs38Rac8/I01hlu3W1S AfMtZVBCr0jFEvVbFQYo//HYMgkG2hHQNJlxXhxUBgp0pmmoKn6uL3SfPLtHMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891365; a=rsa-sha256; cv=none; b=qjepgu6mWumALkJjjrI516wARRsg151gtaKlWWCsytC4BViJ5A517mSrBwWPb8O0iDFCcz U/3tAvYkK1FjDoaYY3eV7zRAQd058T4/bKxTKGtLUH5U90+aMdzje8zsMveXqFBEdkfmXX lYyseMnobkFap2kHPQZJO5MCP6dM+551jjNIfKYdzdBNtoiqeQsSN+d+A+lfQDPCN4n+wY s+kR8GSUIo7lUwFjbDFzpOo2h69JPHQmBbO6uWgyFdEoJOxtZAXzBuNuoxHiW2VmmfI7H/ uEFW7YJbYakNjW3N2lFXf5EugX2Q4nN32pu6rks09Jl8DjfIoFABJSsF0EsARA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e565fa55e68757b9abe42cf42e8bf20916546c94 commit e565fa55e68757b9abe42cf42e8bf20916546c94 Author: John Baldwin AuthorDate: 2022-04-13 23:08:20 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:20 +0000 sfxge: Use __diagused for variables only used in KASSERT(). --- sys/dev/sfxge/sfxge_ev.c | 6 +++--- sys/dev/sfxge/sfxge_mcdi.c | 4 ++-- sys/dev/sfxge/sfxge_rx.c | 7 ++++--- sys/dev/sfxge/sfxge_tx.c | 8 ++++---- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/sys/dev/sfxge/sfxge_ev.c b/sys/dev/sfxge/sfxge_ev.c index 70e44a1e9723..da04cb3ce061 100644 --- a/sys/dev/sfxge/sfxge_ev.c +++ b/sys/dev/sfxge/sfxge_ev.c @@ -814,7 +814,7 @@ fail: void sfxge_ev_stop(struct sfxge_softc *sc) { - struct sfxge_intr *intr; + struct sfxge_intr *intr __diagused; efx_nic_t *enp; int index; @@ -836,7 +836,7 @@ sfxge_ev_stop(struct sfxge_softc *sc) int sfxge_ev_start(struct sfxge_softc *sc) { - struct sfxge_intr *intr; + struct sfxge_intr *intr __diagused; int index; int rc; @@ -957,7 +957,7 @@ fail_evq_stat_init: void sfxge_ev_fini(struct sfxge_softc *sc) { - struct sfxge_intr *intr; + struct sfxge_intr *intr __diagused; int index; intr = &sc->intr; diff --git a/sys/dev/sfxge/sfxge_mcdi.c b/sys/dev/sfxge/sfxge_mcdi.c index 00aaa73027a8..8107cdd42aaf 100644 --- a/sys/dev/sfxge/sfxge_mcdi.c +++ b/sys/dev/sfxge/sfxge_mcdi.c @@ -76,7 +76,7 @@ sfxge_mcdi_poll(struct sfxge_softc *sc, uint32_t timeout_us) efx_nic_t *enp; clock_t delay_total; clock_t delay_us; - boolean_t aborted; + boolean_t aborted __diagused; delay_total = 0; delay_us = SFXGE_MCDI_POLL_INTERVAL_MIN; @@ -140,7 +140,7 @@ static void sfxge_mcdi_ev_cpl(void *arg) { struct sfxge_softc *sc; - struct sfxge_mcdi *mcdi; + struct sfxge_mcdi *mcdi __diagused; sc = (struct sfxge_softc *)arg; mcdi = &sc->mcdi; diff --git a/sys/dev/sfxge/sfxge_rx.c b/sys/dev/sfxge/sfxge_rx.c index 1f94b066dc78..1baab1ac17a6 100644 --- a/sys/dev/sfxge/sfxge_rx.c +++ b/sys/dev/sfxge/sfxge_rx.c @@ -223,7 +223,7 @@ sfxge_rx_qfill(struct sfxge_rxq *rxq, unsigned int target, boolean_t retrying) { struct sfxge_softc *sc; unsigned int index; - struct sfxge_evq *evq; + struct sfxge_evq *evq __diagused; unsigned int batch; unsigned int rxfill; unsigned int mblksize; @@ -815,7 +815,7 @@ sfxge_rx_qcomplete(struct sfxge_rxq *rxq, boolean_t eop) int if_capenable = sc->ifnet->if_capenable; int lro_enabled = if_capenable & IFCAP_LRO; unsigned int index; - struct sfxge_evq *evq; + struct sfxge_evq *evq __diagused; unsigned int completed; unsigned int level; struct mbuf *m; @@ -844,7 +844,8 @@ sfxge_rx_qcomplete(struct sfxge_rxq *rxq, boolean_t eop) /* Read the length from the pseudo header if required */ if (rx_desc->flags & EFX_PKT_PREFIX_LEN) { uint16_t tmp_size; - int rc; + int rc __diagused; + rc = efx_pseudo_hdr_pkt_length_get(rxq->common, mtod(m, uint8_t *), &tmp_size); diff --git a/sys/dev/sfxge/sfxge_tx.c b/sys/dev/sfxge/sfxge_tx.c index 8be74a81bd8b..f2af6da9fcaf 100644 --- a/sys/dev/sfxge/sfxge_tx.c +++ b/sys/dev/sfxge/sfxge_tx.c @@ -331,10 +331,10 @@ sfxge_tx_qreap(struct sfxge_txq *txq) static void sfxge_tx_qlist_post(struct sfxge_txq *txq) { - unsigned int old_added; + unsigned int old_added __diagused; unsigned int block_level; unsigned int level; - int rc; + int rc __diagused; SFXGE_TXQ_LOCK_ASSERT_OWNED(txq); @@ -1433,7 +1433,7 @@ static void sfxge_tx_qunblock(struct sfxge_txq *txq) { struct sfxge_softc *sc; - struct sfxge_evq *evq; + struct sfxge_evq *evq __diagused; sc = txq->sc; evq = sc->evq[txq->evq_index]; @@ -2001,7 +2001,7 @@ int sfxge_tx_init(struct sfxge_softc *sc) { const efx_nic_cfg_t *encp = efx_nic_cfg_get(sc->enp); - struct sfxge_intr *intr; + struct sfxge_intr *intr __diagused; int index; int rc;