The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=74f1cd7bd6a830474cd475a14a2cc4e7e3ac1aa1
commit 74f1cd7bd6a830474cd475a14a2cc4e7e3ac1aa1 Author: John Baldwin <[email protected]> AuthorDate: 2022-04-08 00:01:28 +0000 Commit: John Baldwin <[email protected]> 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);
