From nobody Fri Apr 8 00:03:35 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 B63361A87E1E; Fri, 8 Apr 2022 00:03:37 +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 4KZJPN4lPFz4kxd; Fri, 8 Apr 2022 00:03:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376217; 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=Js46kHP3w7r38iSrdjMOhpkeadSuPD2ts+ABLbGO7Lg=; b=xt5MXzx9NDgCGrd3ypPqzMFunQ/dQIyZja4ErOurNb2GjS5fU7jkKuFxF9eU2SUGKIJaf5 IzupdoDHl4ZDp7ecQkP67mo4Mgz0tupRXFOOro/els9mU/vdYi+KPyTM/RZ3vkVPkmPIqW ixYQ4ggail3ziU4di9zaFd71jtDNpU88QemJsimV+SnGBh5z1xqjGnmVBlO70dCj1A6DnS F4QBDMmQsa7pJMFot2qeJ9Gx9QcbvDnSsYM2lOL6ghh13SaHvbYX1GqNHh/69b+ejkkFj2 bE7/9ZjOAxr5xMa8tdNa9C7s5VWbuPBWsbmixPrUiv9sqaWMWmViohyihyHVmg== 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 135C11A47D; Fri, 8 Apr 2022 00:03:36 +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 23803Z8a086564; Fri, 8 Apr 2022 00:03:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23803ZaI086563; Fri, 8 Apr 2022 00:03:35 GMT (envelope-from git) Date: Fri, 8 Apr 2022 00:03:35 GMT Message-Id: <202204080003.23803ZaI086563@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: ec86afafbb33 - main - qlxgb: Remove unused 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec86afafbb338c594ef48bc5aa1bf11bb30de233 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376217; 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=Js46kHP3w7r38iSrdjMOhpkeadSuPD2ts+ABLbGO7Lg=; b=vFETdgH7pdvMEh3EnVLQvOa9vnrEhRg5uCYiA+KIb62zKSzDxiZNL4QblYuSnk6cFZ3oQW F6cOqr011Q+/IS2t8sXqArwPD9Ig8gqbxfpSf3mWIuPNcgj1cjwtUM8EY8V1kqd2pXWkTD AOYNvkykzRt+Sw24OY1JN8rVmbUV9r8RAgImE8U1hLki+K1OF77oOhbckIV/PNsh/X502O snKje/ionwnJq0frzFrvfLT0aBnYdJc4mJNGb+hEvaqj9S9wMF1pNqXr+LLBRlZRPFTgva wjQclxYBTcJ/OVvoHPZcPRh2pio4I1WqVKqwcuKt9tNQyUDJ88f8kyNSjRmYUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649376217; a=rsa-sha256; cv=none; b=WaP4nE0E4uxC1dmSCDfXP9vZhwL24fl2weWluPIlLkUiMDMIiladkQr6FYcYBe+YohRKDl lUqqGHAi+x4QiJy3awfFFkAp4xu5MAyzq8q/VY8eNmPwFHHep7qZorl35ga5yx8fNZZq7v ddo5uRWF34/koVkJ6EUo73WrQfdVYKN5B20l/fupS1buiPIJ9GPgFnjy/pqHscxmnW5Tp2 8CXQTqB5+faCc08OWbAzaAXnCT/w8knM8bRmuKCO7jeBFu/ImPQiluWp3pTIXNomZ1zU6g jBzZHWOuaRRCXrPnF8jaU13ioBeEFqP90LPyAvFM0OpxHCWH7cpD0cUKNcTibw== 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=ec86afafbb338c594ef48bc5aa1bf11bb30de233 commit ec86afafbb338c594ef48bc5aa1bf11bb30de233 Author: John Baldwin AuthorDate: 2022-04-08 00:01:28 +0000 Commit: John Baldwin 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);