From nobody Fri Apr 8 00:03:39 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 22D5E1A880AA; Fri, 8 Apr 2022 00:03:41 +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 4KZJPR5c9Xz4kqc; Fri, 8 Apr 2022 00:03:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376220; 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=nrknK/NhbLyQSgmLA/mXNCFv2dL/m5TVuR0hyRxkgNM=; b=TV1wMbyYa7vHESTpDJUBPkjh9L/+hisuHLK6VHjjGq9StfowBp68ADyHI7CArq62Uub/uQ rclI+hWXZTYVKvuAB9czVUmTCOhfqDFyJk4bh2mordXsXlFB/5EAii6cWkZzl1CJwSxGsK zjeal0GEEcLKGUqGI6P9M1EZBxw6ZckQ483/BpwaAdTpULjnbZDgq6O4XR4U6KA4T/yIQI scJJn6nB2Z64HgT6LPc4/kUbj0gTVttRDlcH2+Qa48Qmdmctwcn8mg7TW6yJ9OuuklovQt pxSvic7CHhvk3RIPCqNVZqLgbtyODfUHAN0meypVZJvi96wsS+dkxLT+wzYSXA== 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 8C6401A49C; Fri, 8 Apr 2022 00:03:39 +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 23803dNU086642; Fri, 8 Apr 2022 00:03:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23803dwW086641; Fri, 8 Apr 2022 00:03:39 GMT (envelope-from git) Date: Fri, 8 Apr 2022 00:03:39 GMT Message-Id: <202204080003.23803dwW086641@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: 5bf982c16291 - main - qlxge: 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: 5bf982c16291be8a897a99964c3c0021b0344562 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376220; 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=nrknK/NhbLyQSgmLA/mXNCFv2dL/m5TVuR0hyRxkgNM=; b=Xg6/d53i2l/MlVsXpE1f+Sc7QPxcFKFsZVo1B1gBn5RTy2Mq29U6y3F0Px+4fEsa8TLJ2X m+Q6xP7qcfC6iBPPKyOs4QEvW8Bzkxyk4MHEiv2wz6GKnABOc+lQmyzolRY6umHY6uZrXd jCEiK90Yu7aEvZ2UdM9VaZAfhQzvumRCjy/CWj3uy03gZ+azVkSkuaTyyIagt6QESESd6b nv59CpP0BoTMK8iE1DRwDUBy9uZiUHgC7VTmYZsKrwZNOcaKJL6595F9pJz9aZDxzKy4nS rFiaVncqyDdDREEmS2ntRbo+FYcnl3FhTbDZFcFh3GdcSc/fzdty+d2tS39NJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649376220; a=rsa-sha256; cv=none; b=oQIa8hjRo0Ez+YGzcz4RtdPMnNEi3Cciw+F21bmvsEdDgad8rG1qxsBfys9gr2pvo09hvX 4xwOQeftvaZ2d3iNdAPGnp9Ern/6LuQ288nCNqn5JFZXw7ZKu+n8Y6E/U2gle2lAdcQ8Bd 8Vs75mSrs/rgp6trOfdUFulDT04D/Kt4kFN/4Zy+0meUTanvkAuEm3CSGaEtBoorZ+Z/9A +SjeydC0wfC5oSHjmweLyuU8X/johkGKdtNq+om8C5eLOzIip/XKTckE05LA2/Qr4PVojr ZIA9n7qom9LKQned9eO3YhoYSQy9uKJfff3g+h/wIRkV7ndF8iZubmB/v5Pr9w== 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=5bf982c16291be8a897a99964c3c0021b0344562 commit 5bf982c16291be8a897a99964c3c0021b0344562 Author: John Baldwin AuthorDate: 2022-04-08 00:01:28 +0000 Commit: John Baldwin CommitDate: 2022-04-08 00:01:28 +0000 qlxge: Remove unused variables. --- sys/dev/qlxge/qls_dump.c | 3 +-- sys/dev/qlxge/qls_hw.c | 15 +++------------ sys/dev/qlxge/qls_ioctl.c | 3 --- sys/dev/qlxge/qls_os.c | 9 --------- 4 files changed, 4 insertions(+), 26 deletions(-) diff --git a/sys/dev/qlxge/qls_dump.c b/sys/dev/qlxge/qls_dump.c index 952107e351be..ea6a7350f590 100644 --- a/sys/dev/qlxge/qls_dump.c +++ b/sys/dev/qlxge/qls_dump.c @@ -503,7 +503,6 @@ static void qls_wr_ofunc_reg(qla_host_t *ha, uint32_t reg, uint32_t value) { uint32_t ofunc; - int ret = 0; ofunc = qls_get_other_fnum(ha); @@ -512,7 +511,7 @@ qls_wr_ofunc_reg(qla_host_t *ha, uint32_t reg, uint32_t value) reg = Q81_CTL_PROC_ADDR_REG_BLOCK | (ofunc << Q81_FUNCTION_SHIFT) | reg; - ret = qls_wr_mpi_reg(ha, reg, value); + qls_wr_mpi_reg(ha, reg, value); return; } diff --git a/sys/dev/qlxge/qls_hw.c b/sys/dev/qlxge/qls_hw.c index a0a92e2f5d2a..0fda6da46ebc 100644 --- a/sys/dev/qlxge/qls_hw.c +++ b/sys/dev/qlxge/qls_hw.c @@ -445,9 +445,7 @@ qls_set_promisc(qla_host_t *ha) void qls_reset_promisc(qla_host_t *ha) { - int ret; - - ret = qls_load_route_idx_reg_locked(ha, (Q81_CTL_RI_TYPE_NICQMASK | + qls_load_route_idx_reg_locked(ha, (Q81_CTL_RI_TYPE_NICQMASK | Q81_CTL_RI_IDX_PROMISCUOUS | Q81_CTL_RI_DST_DFLTQ), 0); return; } @@ -467,9 +465,7 @@ qls_set_allmulti(qla_host_t *ha) void qls_reset_allmulti(qla_host_t *ha) { - int ret; - - ret = qls_load_route_idx_reg_locked(ha, (Q81_CTL_RI_TYPE_NICQMASK | + qls_load_route_idx_reg_locked(ha, (Q81_CTL_RI_TYPE_NICQMASK | Q81_CTL_RI_IDX_ALLMULTI | Q81_CTL_RI_DST_DFLTQ), 0); return; } @@ -538,11 +534,8 @@ qls_tx_tso_chksum(qla_host_t *ha, struct mbuf *mp, q81_tx_tso_t *tx_mac) uint32_t ehdrlen, ip_hlen; int ret = 0; uint16_t etype; - device_t dev; uint8_t buf[sizeof(struct ip6_hdr)]; - dev = ha->pci_dev; - eh = mtod(mp, struct ether_vlan_header *); if (eh->evl_encap_proto == htons(ETHERTYPE_VLAN)) { @@ -2133,7 +2126,7 @@ qls_mbx_cmd(qla_host_t *ha, uint32_t *in_mbx, uint32_t i_count, uint32_t *out_mbx, uint32_t o_count) { int i, ret = -1; - uint32_t data32, mbx_cmd = 0; + uint32_t data32; uint32_t count = 50; QL_DPRINT2((ha->pci_dev, "%s: enter[0x%08x 0x%08x 0x%08x]\n", @@ -2155,8 +2148,6 @@ qls_mbx_cmd(qla_host_t *ha, uint32_t *in_mbx, uint32_t i_count, ha->mbx_done = 0; - mbx_cmd = *in_mbx; - for (i = 0; i < i_count; i++) { ret = qls_mbx_wr_reg(ha, i, *in_mbx); diff --git a/sys/dev/qlxge/qls_ioctl.c b/sys/dev/qlxge/qls_ioctl.c index 1ce380d9c5eb..d32ee5e22eb7 100644 --- a/sys/dev/qlxge/qls_ioctl.c +++ b/sys/dev/qlxge/qls_ioctl.c @@ -84,15 +84,12 @@ qls_eioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, { qla_host_t *ha; int rval = 0; - device_t pci_dev; qls_mpi_dump_t *mpi_dump; if ((ha = (qla_host_t *)dev->si_drv1) == NULL) return ENXIO; - pci_dev= ha->pci_dev; - switch(cmd) { case QLA_MPI_DUMP: mpi_dump = (qls_mpi_dump_t *)data; diff --git a/sys/dev/qlxge/qls_os.c b/sys/dev/qlxge/qls_os.c index a45e10da492d..66216eeb7aed 100644 --- a/sys/dev/qlxge/qls_os.c +++ b/sys/dev/qlxge/qls_os.c @@ -485,7 +485,6 @@ static int qls_pci_detach(device_t dev) { qla_host_t *ha = NULL; - struct ifnet *ifp; QL_DPRINT2((dev, "%s: enter\n", __func__)); @@ -494,8 +493,6 @@ qls_pci_detach(device_t dev) return (ENOMEM); } - ifp = ha->ifp; - (void)QLA_LOCK(ha, __func__, 0); qls_stop(ha); QLA_UNLOCK(ha, __func__); @@ -1207,9 +1204,6 @@ static void qls_stop(qla_host_t *ha) { struct ifnet *ifp = ha->ifp; - device_t dev; - - dev = ha->pci_dev; ifp->if_drv_flags &= ~(IFF_DRV_OACTIVE | IFF_DRV_RUNNING); @@ -1372,7 +1366,6 @@ int qls_get_mbuf(qla_host_t *ha, qla_rx_buf_t *rxb, struct mbuf *nmp) { struct mbuf *mp = nmp; - struct ifnet *ifp; int ret = 0; uint32_t offset; bus_dma_segment_t segs[1]; @@ -1380,8 +1373,6 @@ qls_get_mbuf(qla_host_t *ha, qla_rx_buf_t *rxb, struct mbuf *nmp) QL_DPRINT2((ha->pci_dev, "%s: enter\n", __func__)); - ifp = ha->ifp; - if (mp == NULL) { mp = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, ha->msize);