From nobody Fri Dec 10 04:54:02 2021 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 A6F8018DFAA3; Fri, 10 Dec 2021 04:54:02 +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 4J9JTQ2lJgz3h8l; Fri, 10 Dec 2021 04:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3E11D144DC; Fri, 10 Dec 2021 04:54:02 +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 1BA4s2Sh049284; Fri, 10 Dec 2021 04:54:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BA4s2p6049283; Fri, 10 Dec 2021 04:54:02 GMT (envelope-from git) Date: Fri, 10 Dec 2021 04:54:02 GMT Message-Id: <202112100454.1BA4s2p6049283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: d90c3b51cc3a - main - xdma: Fix -Wunused-but-set-variable warnings 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d90c3b51cc3a15235054a5823928e8b654697768 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639112042; 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=2H+wY4A5VwJAWi9qwkEUhfASK8/RNK/xZpt4snxlqM0=; b=X/Z6S4sogGwlxEIwEjG4g1650DLrBuOa6ZKxOcThEWrABzI+cHLCzuSGuJBNnU8/bV/NgQ 95OX0Lr6ncBhqFBRZnAjO0YyvXyh1q50uFarfWcAw9saj0tatfHRlcPNiyN/OF2dSFqUAx DO4d7DytQuocxyk2WEoBlL3RJ8Zm7qZj3IlRZmiAaIpDwAQEAgEHWCBOpoK9dIVL7wu8nB cxKuESqCVDY8V/pGOlqnlNwKL/w1bNcHXtWiV75m/iD3U5S0au6eJN4zwwA8/Bkcg43g5N +GZvGTX0W2o++ypSIlesz/KhNiDuwXvwlzHGZo9AVrZFNA9FQCK+A54wgEON2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639112042; a=rsa-sha256; cv=none; b=ZNcQgOr4o495VgxUBYJyCQeQ/zqa+tNJYYDXG5nLxKNM/NA+FXEkrW/+TEyrss2hQe+Oru zst4/g3Uoesu8vXYfrC0wq6q2NNHe46SoC1u8OA6qlS4UmnadSPlJ4sJuKN6smkCxPZeLW HBMAi23dt8fwABXWt9PpaLsa+wrB5bj7JdzAZ3XK1gOFfETjCda5ySexzpLgcvoiDcvJby SGraFzECtu9FpDwuF69fKyhKkmOjhLInc1/7rNER+LYSsp/RQDDSSNIa0VlqAJY0k3XUTn DQ+60DEGdV60ahR1+KSuQZfIbA8vG895lLZGZCxs6yiVduetCPiN/d2SrCJFQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d90c3b51cc3a15235054a5823928e8b654697768 commit d90c3b51cc3a15235054a5823928e8b654697768 Author: Jessica Clarke AuthorDate: 2021-12-10 04:48:51 +0000 Commit: Jessica Clarke CommitDate: 2021-12-10 04:48:51 +0000 xdma: Fix -Wunused-but-set-variable warnings MFC after: 1 week --- 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)