From nobody Fri Apr 08 00:03:42 2022 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 4710D1A88400; Fri, 8 Apr 2022 00:03:44 +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 4KZJPW2fGfz4l7x; Fri, 8 Apr 2022 00:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376223; 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=xy0/QYewrL/Jarp1B/khVgw/ngstQsDp6otsUC25w5o=; b=GUbS8GNZA1ORLFQsX1GKZsKljxGvvDTGG9r6Gm3HcETEbn21/uTAlhBwafK2EUdzHDfRxf AV8KFUdMBq/oTfCG276PH7BehOfGZygptQqlMyLI2WI5Bsg5dDFmUSkN50iF3dq2d9F86r 9SeK2VRlaehhjtRz+U6bCaLSGHpduWqxugydBHOvsJUOIQvLkUvJ4fJbdjXQIeHFQeJazO 6UnmuQdMVysYmHrJCLJuDiFv8HyY0j3Yz+Zyf73B50cOZz+fui2V5Y/0o71b3uhtIMx6zs wZ3IFSg1JcqLsSqEcxDGozynNYwf/3auB0eowJDDlg5t5EX4qkZOIdnNIJbc4Q== 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 0F88119B68; Fri, 8 Apr 2022 00:03:43 +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 23803gYc086714; Fri, 8 Apr 2022 00:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23803gIG086713; Fri, 8 Apr 2022 00:03:42 GMT (envelope-from git) Date: Fri, 8 Apr 2022 00:03:42 GMT Message-Id: <202204080003.23803gIG086713@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: 74f1cd7bd6a8 - main - sfxge: Remove unused variables. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 74f1cd7bd6a830474cd475a14a2cc4e7e3ac1aa1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376223; 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=xy0/QYewrL/Jarp1B/khVgw/ngstQsDp6otsUC25w5o=; b=JNiKD4as2bkbk9gBl4JIJIxp3zKVpDOwadx3B6YjH6UOP+W71RMx3VIvL/7T/Db8btkV9U +UWjbuecfHqPG1qVwe/zR8CA+EYzvFsxrjkAiVFj0yXUiccNNjuSSpgAdrWW8gT4p7g3vi bjEMkNoOZhAtRoR+4n2gvJ4FsAee1NULZkr3CtB9/9XSvIbYQ7sfg3Wn0I5CsSrHB226g+ fKTMn/cxHCGg8If5iLzE0PVTL6nRoXGOksDtcHO2aSTnVh0c64rJfimpYbzkB/M42ehFEP c/NeVAJ4hrIIfKM+uU3Xpw7ZlQu0bOIsOOY+oGLv8dW7YdXp5nZ7JKcT2lG8Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649376223; a=rsa-sha256; cv=none; b=lhO5nKgDMRRyJAcSLoyJb0F48Np2J1mfuF4WF//CKyYXkbeLE+D41vkGn5qx6wMhIKO4G3 gg8HU7tw7gd6IM9h2Q3bVrXmFjrgGd4mheGn/XDqzgKdJWskSVJUFRBTH1Ui5JnGu1NN0j MECl2hER6A9xHZatH4Noau3aGxgPMpDluxJfwn+XB4xx9vHfUdANKBB+hgmgAudLQmmvxl 9e7zTAlDYPqzma2bS4ZoQSWTcvt8vDPMFi2b+cxocmt0EP4OWCzIuN2y/wEs/6M6nQ+LMa KBakXuqa76qxpMWwYwFc7LHuL/hrkTJMPB301VPqqTgV5JuxysNJtnNj/0nKeA== 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=74f1cd7bd6a830474cd475a14a2cc4e7e3ac1aa1 commit 74f1cd7bd6a830474cd475a14a2cc4e7e3ac1aa1 Author: John Baldwin AuthorDate: 2022-04-08 00:01:28 +0000 Commit: John Baldwin CommitDate: 2022-04-08 00:01:28 +0000 sfxge: Remove unused variables. --- sys/dev/sfxge/sfxge_ev.c | 3 --- sys/dev/sfxge/sfxge_intr.c | 2 -- sys/dev/sfxge/sfxge_rx.c | 6 ------ sys/dev/sfxge/sfxge_tx.c | 3 --- 4 files changed, 14 deletions(-) diff --git a/sys/dev/sfxge/sfxge_ev.c b/sys/dev/sfxge/sfxge_ev.c index 9356e01efeff..70e44a1e9723 100644 --- a/sys/dev/sfxge/sfxge_ev.c +++ b/sys/dev/sfxge/sfxge_ev.c @@ -358,14 +358,11 @@ static boolean_t sfxge_ev_software(void *arg, uint16_t magic) { struct sfxge_evq *evq; - struct sfxge_softc *sc; unsigned int label; evq = (struct sfxge_evq *)arg; SFXGE_EVQ_LOCK_ASSERT_OWNED(evq); - sc = evq->sc; - label = magic & SFXGE_MAGIC_DMAQ_LABEL_MASK; magic &= ~SFXGE_MAGIC_DMAQ_LABEL_MASK; diff --git a/sys/dev/sfxge/sfxge_intr.c b/sys/dev/sfxge/sfxge_intr.c index 5f6b1bbcc94b..6c8c2c757109 100644 --- a/sys/dev/sfxge/sfxge_intr.c +++ b/sys/dev/sfxge/sfxge_intr.c @@ -338,7 +338,6 @@ sfxge_intr_setup_msix(struct sfxge_softc *sc) static int sfxge_intr_setup_msi(struct sfxge_softc *sc) { - struct sfxge_intr_hdl *table; struct sfxge_intr *intr; device_t dev; int count; @@ -346,7 +345,6 @@ sfxge_intr_setup_msi(struct sfxge_softc *sc) dev = sc->dev; intr = &sc->intr; - table = intr->table; /* * Check if MSI is available. All messages must be written to diff --git a/sys/dev/sfxge/sfxge_rx.c b/sys/dev/sfxge/sfxge_rx.c index 111e1ee5b880..1f94b066dc78 100644 --- a/sys/dev/sfxge/sfxge_rx.c +++ b/sys/dev/sfxge/sfxge_rx.c @@ -1083,14 +1083,11 @@ sfxge_rx_stop(struct sfxge_softc *sc) int sfxge_rx_start(struct sfxge_softc *sc) { - struct sfxge_intr *intr; const efx_nic_cfg_t *encp; size_t hdrlen, align, reserved; int index; int rc; - intr = &sc->intr; - /* Initialize the common code receive module. */ if ((rc = efx_rx_init(sc->enp)) != 0) return (rc); @@ -1273,7 +1270,6 @@ static int sfxge_rx_qinit(struct sfxge_softc *sc, unsigned int index) { struct sfxge_rxq *rxq; - struct sfxge_evq *evq; efsys_mem_t *esmp; int rc; @@ -1289,8 +1285,6 @@ sfxge_rx_qinit(struct sfxge_softc *sc, unsigned int index) sc->rxq[index] = rxq; esmp = &rxq->mem; - evq = sc->evq[index]; - /* Allocate and zero DMA space. */ if ((rc = sfxge_dma_alloc(sc, EFX_RXQ_SIZE(sc->rxq_entries), esmp)) != 0) return (rc); diff --git a/sys/dev/sfxge/sfxge_tx.c b/sys/dev/sfxge/sfxge_tx.c index 663b4e99270f..8be74a81bd8b 100644 --- a/sys/dev/sfxge/sfxge_tx.c +++ b/sys/dev/sfxge/sfxge_tx.c @@ -1811,7 +1811,6 @@ sfxge_tx_qinit(struct sfxge_softc *sc, unsigned int txq_index, struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(sc->dev); struct sysctl_oid *txq_node; struct sfxge_txq *txq; - struct sfxge_evq *evq; struct sfxge_tx_dpl *stdp; struct sysctl_oid *dpl_node; efsys_mem_t *esmp; @@ -1826,8 +1825,6 @@ sfxge_tx_qinit(struct sfxge_softc *sc, unsigned int txq_index, sc->txq[txq_index] = txq; esmp = &txq->mem; - evq = sc->evq[evq_index]; - /* Allocate and zero DMA space for the descriptor ring. */ if ((rc = sfxge_dma_alloc(sc, EFX_TXQ_SIZE(sc->txq_entries), esmp)) != 0) return (rc);