From nobody Tue Jan 25 01:40:08 2022 X-Original-To: dev-commits-src-branches@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 BC63E1972C73; Tue, 25 Jan 2022 01:40:10 +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 4JjV0T0BHsz4ZQf; Tue, 25 Jan 2022 01:40:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074810; 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=/MWSbB52SzIxXlPDbTO3h27Kob/A/aaI8lcl5iCghgM=; b=w6q6R0mkh0s5NPAyi5B99dyBPU6xuLEI7UuWrllxHcdvNwYvppKVH4gmXJuDWmmHwM+mGX qBQecEgsI7hwntK7T5/KlLkCNeYuEniY4HTSCM8peGU7ko0I9QDr7XpghCGt4orpxNBEaO czm+E85YnoGRM6rHROFChqHzhnelOOHpaXx7mfWmcMUP275HX3pwG8uJEkx2kRSgVn+DhM 4+9Zu5AfiOoni43ZNEk3YqybcOEC/DwqV/Nc+7MWUd2fU8hUPNzBu0VkxT/8GPe0GfG4Jz 76cGnW2mxgQMs1DpDznwyH9zFE1SdwiB349gFvso9ATj/71FTfOMZJUNL2tkjA== 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 70FA62086C; Tue, 25 Jan 2022 01:40:08 +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 20P1e8oH045990; Tue, 25 Jan 2022 01:40:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P1e86K045987; Tue, 25 Jan 2022 01:40:08 GMT (envelope-from git) Date: Tue, 25 Jan 2022 01:40:08 GMT Message-Id: <202201250140.20P1e86K045987@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: c95bc1a7f975 - stable/13 - xdma: Fix -Wunused-but-set-variable warnings List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c95bc1a7f9750f57201dd0c822ff3084958bca76 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074810; 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=/MWSbB52SzIxXlPDbTO3h27Kob/A/aaI8lcl5iCghgM=; b=Ijc1912xmI5J7cHFTsAkMzC6yWza6orD/yolwfwi6uuYS4gKQG0abcWCDyvr/dCvmAxFOC mceSJhX3ixauRcUPBQvzhpgCG2dkPc6kMt5qPGsYCik9oABfUTKbdSjLC6nVCQyzElLV1u 5d0DWzahHHJl/eDfQQBok0YZyIE8wdjwceLPL2B12MxHab8DY7taQbxmmjKnERpwilj5GI uOUCG3Trp0n3eC0Tct53QtQKCOzomyBy2IAYOCiKonvLh0pGN8tPJ2O3Fsq+FoC1A6ZiyD HbqoP5sL5tBILaWI+QvsTMQR1PP+s+L8qa2wALEc/0OMifymZzpZP0SjJgMdwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643074810; a=rsa-sha256; cv=none; b=u0MczCJM3RpHPuB76EsSrd+BTOyEI7bHdHxLLafj0+1GdlsaW4AtkyPkfbcJKZn8VDTrHf 2Fq9kwCoEG0Bx0WQISQnAFtjoxv5BZ3HWwLPl5IQ99AVQ0tOsRPUX/Z+ijeSm9eU462Dm0 iXbcCpe9FKIgUsSG3T+rhdQ84r20QVkFvwFis0/1EANiJkRM0ec2Zb3/jGV43kOCFSykQW BYUwpydBJ1UtIY9fOU/JQ3UbR2bdDcKfgBUauJXt7hxk48IcQFLoW1/7IEWKxmVvdqAYUT oVMfCPL+aVde4eo+TzLosEaKbjUtscSluB3LZsb+jPN0FQ90A5y5WCQwDon3lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c95bc1a7f9750f57201dd0c822ff3084958bca76 commit c95bc1a7f9750f57201dd0c822ff3084958bca76 Author: Jessica Clarke AuthorDate: 2021-12-10 04:48:51 +0000 Commit: Jessica Clarke CommitDate: 2022-01-24 23:59:33 +0000 xdma: Fix -Wunused-but-set-variable warnings MFC after: 1 week (cherry picked from commit d90c3b51cc3a15235054a5823928e8b654697768) --- sys/dev/xdma/xdma_mbuf.c | 3 --- sys/dev/xdma/xdma_sg.c | 11 ----------- 2 files changed, 14 deletions(-) diff --git a/sys/dev/xdma/xdma_mbuf.c b/sys/dev/xdma/xdma_mbuf.c index 58fab199803b..c6c9a8f48ba9 100644 --- a/sys/dev/xdma/xdma_mbuf.c +++ b/sys/dev/xdma/xdma_mbuf.c @@ -82,9 +82,6 @@ xdma_enqueue_mbuf(xdma_channel_t *xchan, struct mbuf **mp, enum xdma_direction dir) { struct xdma_request *xr; - xdma_controller_t *xdma; - - xdma = xchan->xdma; xr = xchan_bank_get(xchan); if (xr == NULL) diff --git a/sys/dev/xdma/xdma_sg.c b/sys/dev/xdma/xdma_sg.c index add034ae846d..f27b410a4a32 100644 --- a/sys/dev/xdma/xdma_sg.c +++ b/sys/dev/xdma/xdma_sg.c @@ -324,12 +324,9 @@ xchan_seg_done(xdma_channel_t *xchan, struct xdma_transfer_status *st) { struct xdma_request *xr; - xdma_controller_t *xdma; struct xchan_buf *b; bus_addr_t addr; - xdma = xchan->xdma; - xr = TAILQ_FIRST(&xchan->processing); if (xr == NULL) panic("request not found\n"); @@ -487,15 +484,12 @@ static int _xdma_load_data(xdma_channel_t *xchan, struct xdma_request *xr, struct bus_dma_segment *seg) { - xdma_controller_t *xdma; struct mbuf *m; uint32_t nsegs; vm_offset_t va, addr; bus_addr_t pa; vm_prot_t prot; - xdma = xchan->xdma; - m = xr->m; KASSERT(xchan->caps & (XCHAN_CAP_NOSEG | XCHAN_CAP_BOUNCE), @@ -548,13 +542,8 @@ static int xdma_load_data(xdma_channel_t *xchan, struct xdma_request *xr, struct bus_dma_segment *seg) { - xdma_controller_t *xdma; - int error; int nsegs; - xdma = xchan->xdma; - - error = 0; nsegs = 0; if (xchan->caps & XCHAN_CAP_BUSDMA)