The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ec86afafbb338c594ef48bc5aa1bf11bb30de233
commit ec86afafbb338c594ef48bc5aa1bf11bb30de233 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 qlxgb: Remove unused variables. --- sys/dev/qlxgb/qla_hw.c | 6 ------ sys/dev/qlxgb/qla_isr.c | 2 -- sys/dev/qlxgb/qla_os.c | 9 --------- 3 files changed, 17 deletions(-) diff --git a/sys/dev/qlxgb/qla_hw.c b/sys/dev/qlxgb/qla_hw.c index 6144df147ee4..f96d85fba139 100644 --- a/sys/dev/qlxgb/qla_hw.c +++ b/sys/dev/qlxgb/qla_hw.c @@ -273,11 +273,8 @@ qla_init_cntxt_regions(qla_host_t *ha) q80_rcv_cntxt_req_t *rx_cntxt_req; bus_addr_t phys_addr; uint32_t i; - device_t dev; uint32_t size; - dev = ha->pci_dev; - hw = &ha->hw; hw->tx_ring_base = hw->dma_buf.tx_ring.dma_b; @@ -1150,14 +1147,11 @@ qla_del_hw_if(qla_host_t *ha) int qla_init_hw_if(qla_host_t *ha) { - device_t dev; int i; uint8_t bcast_mac[6]; qla_get_hw_caps(ha); - dev = ha->pci_dev; - for (i = 0; i < ha->hw.num_sds_rings; i++) { bzero(ha->hw.dma_buf.sds_ring[i].dma_b, ha->hw.dma_buf.sds_ring[i].size); diff --git a/sys/dev/qlxgb/qla_isr.c b/sys/dev/qlxgb/qla_isr.c index 271baa886d1b..4c030f600bcf 100644 --- a/sys/dev/qlxgb/qla_isr.c +++ b/sys/dev/qlxgb/qla_isr.c @@ -378,14 +378,12 @@ qla_rcv(void *context, int pending) { qla_ivec_t *ivec = context; qla_host_t *ha; - device_t dev; qla_hw_t *hw; uint32_t sds_idx; uint32_t ret; struct ifnet *ifp; ha = ivec->ha; - dev = ha->pci_dev; hw = &ha->hw; sds_idx = ivec->irq_rid - 1; ifp = ha->ifp; diff --git a/sys/dev/qlxgb/qla_os.c b/sys/dev/qlxgb/qla_os.c index ab436867771e..a52527476837 100644 --- a/sys/dev/qlxgb/qla_os.c +++ b/sys/dev/qlxgb/qla_os.c @@ -409,7 +409,6 @@ static int qla_pci_detach(device_t dev) { qla_host_t *ha = NULL; - struct ifnet *ifp; int i; QL_DPRINT2((dev, "%s: enter\n", __func__)); @@ -419,8 +418,6 @@ qla_pci_detach(device_t dev) return (ENOMEM); } - ifp = ha->ifp; - QLA_LOCK(ha, __func__); qla_stop(ha); QLA_UNLOCK(ha, __func__); @@ -1130,9 +1127,6 @@ static void qla_stop(qla_host_t *ha) { struct ifnet *ifp = ha->ifp; - device_t dev; - - dev = ha->pci_dev; ha->flags.qla_watchdog_pause = 1; qla_mdelay(__func__, 100); @@ -1389,14 +1383,11 @@ qla_get_mbuf(qla_host_t *ha, qla_rx_buf_t *rxb, struct mbuf *nmp, uint32_t jumbo) { struct mbuf *mp = nmp; - struct ifnet *ifp; int ret = 0; uint32_t offset; QL_DPRINT2((ha->pci_dev, "%s: jumbo(0x%x) enter\n", __func__, jumbo)); - ifp = ha->ifp; - if (mp == NULL) { if (!jumbo) { mp = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
