From nobody Wed Feb 09 21:22:56 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 47F5419B5481; Wed, 9 Feb 2022 21:22:57 +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 4JvCXK1R3Rz4lh5; Wed, 9 Feb 2022 21:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644441777; 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=EUhP7yhRhiDGsqZKudujXFmxNOfF3YVqoueyiGV+c5k=; b=VKJVwM+nwLTzMDKrt0/QC5itQ/5FVCDWGbvMjsWo+ERZPT2Jd/CLKg4iKbOG6Iz86kOmd/ yumjTEca1mi2PzdNrlikxFnxQAIt1fNLM5LtNFOs89xWy0en+OcTj2N/TZ+IACoIuX7td5 aU9FGap9Y6uxAbnRLim2CIfmE1bGNS89+pC1eO/X1FNiTCDfCN6aHVMAyVFRoopJehSElD 2QsMJE7Nt7w81wCgkuvTthUzWBEGjC7L9opB1U7GANIzBx1/0tV9e4T7p4HLzHx+N4WZCh dcgt6htG2K0RMmTEwEYIWDJqIcLYRZREMQLHv/5gdQrZbnu+HveGptO9QKwa4w== 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 11C0E14A04; Wed, 9 Feb 2022 21:22:57 +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 219LMuWZ042185; Wed, 9 Feb 2022 21:22:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 219LMuUs042184; Wed, 9 Feb 2022 21:22:56 GMT (envelope-from git) Date: Wed, 9 Feb 2022 21:22:56 GMT Message-Id: <202202092122.219LMuUs042184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 51f69c0d533d - stable/13 - mgb: remove set but not used variables 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 51f69c0d533dc7b363a19b9b01cd1310979ee1fc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644441777; 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=EUhP7yhRhiDGsqZKudujXFmxNOfF3YVqoueyiGV+c5k=; b=TLGs4E0PlklyBdVGoe+IxuLXg8iY+FPZkLHkXRed//Mv1QXD1nwGQPUlQPxOkoVozFZDIP OWcKgOcYY76wnIGamYh2hBuFS6jiConarjPUXldr7ED8kEodrqPRhBTxqiVTQrE3X8b3h+ N8HhW4eVjWumZ/a/s87raN97Tx8NLUVQibTmYpj2EfipE5aTHOHrSUWn+l5ajX9p0ukCSZ y1qc9q+WkXuD9WvifJ17BcOhxantXFa/xk0hS5pYOKlj/kxt95JL/okuzguSiT5pd2IRC0 rG/k5gShtoJQj0lTUgF8w4T9AhxyQkG5hQv4hdMaTahr9rjEhwkBxZ//cse/qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644441777; a=rsa-sha256; cv=none; b=KllZmd4UB7maNpH5oj1JGZ9M5J963rbAZWFXqCZ7W/DMkXJEgfkGCiJiMCUs4O1aVRtqZG tQ5Dswe9z1dswm1x+uj2+jPAm4dz964WzYWknpGcHrfBZaT8UP5BOg14hiRBOGK8SENdPi bAcsjpYRND8/m7a8ZGUX9go4I4SGtQTdh0/M53v90/exLLgBphmsRoSeBT3Tdf5t8+Us5B ypXyBDpS6yMbZESpSQ5ag+72z6k/aYG9lkJDU5R1gCg9hpw0q7ugzIANsizDWMU6ZGf2k/ w2SzBGFFHy0L+ALuOnD1L2yYX2zESEF3Knt84pLF2yiho/4R67ColRinv15XZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=51f69c0d533dc7b363a19b9b01cd1310979ee1fc commit 51f69c0d533dc7b363a19b9b01cd1310979ee1fc Author: Ed Maste AuthorDate: 2021-11-23 01:32:29 +0000 Commit: Ed Maste CommitDate: 2022-02-09 21:22:20 +0000 mgb: remove set but not used variables Sponsored by: The FreeBSD Foundation (cherry picked from commit c0aa5f6a321b8e7a921eda69ec0ab7373890c155) --- sys/dev/mgb/if_mgb.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sys/dev/mgb/if_mgb.c b/sys/dev/mgb/if_mgb.c index 6d94f96c09db..cde7d60927bb 100644 --- a/sys/dev/mgb/if_mgb.c +++ b/sys/dev/mgb/if_mgb.c @@ -962,7 +962,6 @@ static int mgb_isc_txd_encap(void *xsc , if_pkt_info_t ipi) { struct mgb_softc *sc; - if_softc_ctx_t scctx; struct mgb_ring_data *rdata; struct mgb_ring_desc *txd; bus_dma_segment_t *segs; @@ -972,7 +971,6 @@ mgb_isc_txd_encap(void *xsc , if_pkt_info_t ipi) KASSERT(ipi->ipi_qsidx == 0, ("tried to refill TX Channel %d.\n", ipi->ipi_qsidx)); sc = xsc; - scctx = iflib_get_softc_ctx(sc->ctx); rdata = &sc->tx_ring_data; pidx = ipi->ipi_pidx; @@ -1057,7 +1055,6 @@ static int mgb_isc_rxd_available(void *xsc, uint16_t rxqid, qidx_t idx, qidx_t budget) { struct mgb_softc *sc; - if_softc_ctx_t scctx; struct mgb_ring_data *rdata; int avail = 0; @@ -1066,7 +1063,6 @@ mgb_isc_rxd_available(void *xsc, uint16_t rxqid, qidx_t idx, qidx_t budget) rxqid)); rdata = &sc->rx_ring_data; - scctx = iflib_get_softc_ctx(sc->ctx); for (; idx != *(rdata->head_wb); idx = MGB_NEXT_RING_IDX(idx)) { avail++; /* XXX: Could verify desc is device owned here */ @@ -1135,7 +1131,6 @@ mgb_isc_rxd_pkt_get(void *xsc, if_rxd_info_t ri) static void mgb_isc_rxd_refill(void *xsc, if_rxd_update_t iru) { - if_softc_ctx_t scctx; struct mgb_softc *sc; struct mgb_ring_data *rdata; struct mgb_ring_desc *rxd; @@ -1152,7 +1147,6 @@ mgb_isc_rxd_refill(void *xsc, if_rxd_update_t iru) ("tried to refill RX Channel %d.\n", iru->iru_qsidx)); sc = xsc; - scctx = iflib_get_softc_ctx(sc->ctx); rdata = &sc->rx_ring_data; while (count > 0) { @@ -1191,11 +1185,10 @@ mgb_isc_rxd_flush(void *xsc, uint16_t rxqid, uint8_t flid, qidx_t pidx) static int mgb_test_bar(struct mgb_softc *sc) { - uint32_t id_rev, dev_id, rev; + uint32_t id_rev, dev_id; id_rev = CSR_READ_REG(sc, 0); dev_id = id_rev >> 16; - rev = id_rev & 0xFFFF; if (dev_id == MGB_LAN7430_DEVICE_ID || dev_id == MGB_LAN7431_DEVICE_ID) { return (0);