From nobody Wed Nov 24 01:57:27 2021 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 CACA7188F5C2; Wed, 24 Nov 2021 01:57:27 +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 4HzPK33F3Jz4Wmb; Wed, 24 Nov 2021 01:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 47B542163D; Wed, 24 Nov 2021 01:57:27 +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 1AO1vRVj050037; Wed, 24 Nov 2021 01:57:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AO1vRHM050036; Wed, 24 Nov 2021 01:57:27 GMT (envelope-from git) Date: Wed, 24 Nov 2021 01:57:27 GMT Message-Id: <202111240157.1AO1vRHM050036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c0aa5f6a321b - main - 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/main X-Git-Reftype: branch X-Git-Commit: c0aa5f6a321b8e7a921eda69ec0ab7373890c155 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637719047; 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=zLZvVdTjM8UI3kHlarr1EiTF6ojk0hLJL38e4yM9Oto=; b=IAbD3+9O/f9sTUFLJ5/n4a0CUQQz43NpJ/Kb3SYO1Au2c+TFTec0wYwIhs8zI8ECkCkrQP kSwDBfcMCbkFj8u4yvRA1l4CsRn6TVPwwg5D++TJJL5jvQQmypqdEBSg+cIKitpA5HnYvZ Isg/UAcTOfUHjSjXl79f+PTdJfM1LoVCxl97G7B88i3Mxr3tihN5qERI8EhtAioFwXWLn1 bGTJ4NadCp0Rynq7sUbWRJGFlNNwXjFANQbFwDR6LYr4ZuFfebdUF4RihvrdrqslSYQHw+ SyaesxLkfB3arm8kSOJAlvlNG/I3vYciFa+QfWhj0cqkcdd81j/+cX7A9DDImg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637719047; a=rsa-sha256; cv=none; b=L4qaLAEG8jIaQCJu/LTm3aG+F42R9z5MuiW9F02fZ3PpHPN7JvO2swvlOcLMGIRN4N4kbu Ss99ujN+S02NRqeLwGEilccAREA+uv3jLbRs260y3ntRuv3BLaRkV8njsRUArA8jVppUvu QkODCuLEf+HkyK4IiHBvVO/xbwfL/WC7RDxhsdi3yr45ZQqDDc+AWC1wvDwsIJ1GRSy+Rt rpkU5IykWjrz9sjHkZj0n8nt0fGec79uZb9XvpixGLjEaem8amd00cIdvf2b3WjbVl7CQI XSESHxE5HcmASnQzCml0vXWQ+2nZhYsoUcwZVANCyuqhpsJo0xSlHdLWN03r/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c0aa5f6a321b8e7a921eda69ec0ab7373890c155 commit c0aa5f6a321b8e7a921eda69ec0ab7373890c155 Author: Ed Maste AuthorDate: 2021-11-23 01:32:29 +0000 Commit: Ed Maste CommitDate: 2021-11-24 01:56:53 +0000 mgb: remove set but not used variables Sponsored by: The FreeBSD Foundation --- 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);