From nobody Sun Jul 24 11:02:33 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 4LrKyK4gjcz4XXVp; Sun, 24 Jul 2022 11:02:33 +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 4LrKyK3bXGz3f0Z; Sun, 24 Jul 2022 11:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658660553; 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=2AHbLZX98WNwQNKitUZBHTjjo8oeskQ+9O6NzpDft/A=; b=MqG91HJ5j0di9U65MOeMz2HNKu2p4/VTmXC+X3t9/hF7lTbuPuWU8JRlixVUy066iP78My N8W+oEqgVQFuwV7Le42hZNxgOYGaXehvjyMmYK3yD1xpX9tdC0194sOUjWF4hbk2XqPjeP im4r1kkMC0SnU/Rfyq70C4vDPmJ62ao8jYsD61tBOgyUQm+dBjGmUi0XZoGwAroo1Hxa4Y rfI+S3j++viBDIpg6msQE0bywPLLdrNqRZihL/MXtrVNrkZ3dI5k9ff52MfE5RpUH5EpYX 0WZ7Pn5X+wY/3JWJgqJghXYMp5K01qkkvF5g9hc/1ZKlh3392jnP5UkNSveP2Q== 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 4LrKyK2jLLzGmH; Sun, 24 Jul 2022 11:02:33 +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 26OB2XVX041688; Sun, 24 Jul 2022 11:02:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26OB2XGe041687; Sun, 24 Jul 2022 11:02:33 GMT (envelope-from git) Date: Sun, 24 Jul 2022 11:02:33 GMT Message-Id: <202207241102.26OB2XGe041687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 94b81ba2a0f9 - stable/12 - Fix unused variable warning in fwohci.c 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 94b81ba2a0f97019bd85fed273d69076396f1d11 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658660553; 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=2AHbLZX98WNwQNKitUZBHTjjo8oeskQ+9O6NzpDft/A=; b=A0TkviI4Ehy4kU6fQugkHq3cwv0Tf0LlfS75/5ff03Rdm5Ey98/eKniNrBYm4/0zdIsykZ NN1VsTdU/5mopLPWtXh4GfIIpU0I9G5BSLM7VBNYFT/JkBJtMQDhjBMDMtrHWTCMOlwIgS ehreAANl3kaEA0yYyiLHqwX1iKS+DZvlOPa0E59hq3GXygawRNNByu+dcAvZVs3zbZqysT nO6sRhi3/R3DJQyBmHyvGKer4r4frBAp1y1O+0BWCzmCXFdsx0rHMJlZYGdmJGXvKp9CG1 bqf4mjnlWhxgZQrbANsprRPO1vTXau9imdlfk/IkDNQlnDNhf59/z9ZuBwAuqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658660553; a=rsa-sha256; cv=none; b=GLrsF61WEkyJPh+SSsx7bF25NCOerJB1JzvcSuYVu6kpo5jXRVP7WuNMIZ0RwLKmptK0J/ 9M65QKD+qfaPq1n9XazqzSqvBtwDxt47ZL/1dIKk1sh4Z9mqhAQU55wWNHAI+jd3dY9Eg1 MwMUn960WRGS+fU0LgXYHLgKoxmrExPMHTmOJX4rXbEMo8tamdkuSXB+EqgogCNJHc67/V RAf/4oAItdGb1+GIytuNyxmeptRMZ6a6VKHeiWwL+NbfM4v9V4tLgsCvHrcZAz1soAvJn1 lsEglQhlPoumxokR4JIPhoX5u2gbdJjZpn9fvJTfLkry2An/Tlq6TlKrMg3sNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=94b81ba2a0f97019bd85fed273d69076396f1d11 commit 94b81ba2a0f97019bd85fed273d69076396f1d11 Author: Dimitry Andric AuthorDate: 2022-07-21 17:59:08 +0000 Commit: Dimitry Andric CommitDate: 2022-07-24 11:01:22 +0000 Fix unused variable warning in fwohci.c With clang 15, the following -Werror warning is produced: sys/dev/firewire/fwohci.c:2762:23: error: variable 'pcnt' set but not used [-Werror,-Wunused-but-set-variable] int len, plen, hlen, pcnt, offset; ^ The 'pcnt' variable is eventually used only in an #if 0'd block, obviously meant for debugging. Ensure that 'pcnt' is only declared and used when COUNT_PACKETS is defined, so the debugging can be easily turned on later, if desired. MFC after: 3 days (cherry picked from commit d7e0d962f39877b997454992a980f4122c6316e7) --- sys/dev/firewire/fwohci.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c index e54d0c4f53bd..93f682ee145b 100644 --- a/sys/dev/firewire/fwohci.c +++ b/sys/dev/firewire/fwohci.c @@ -2740,7 +2740,10 @@ fwohci_arcv(struct fwohci_softc *sc, struct fwohci_dbch *dbch, int count) uint8_t *ld; uint32_t stat, off, status, event; u_int spd; - int len, plen, hlen, pcnt, offset; +#ifdef COUNT_PACKETS + int pcnt; +#endif + int len, plen, hlen, offset; int s; caddr_t buf; int resCount; @@ -2755,7 +2758,9 @@ fwohci_arcv(struct fwohci_softc *sc, struct fwohci_dbch *dbch, int count) s = splfw(); db_tr = dbch->top; +#ifdef COUNT_PACKETS pcnt = 0; +#endif /* XXX we cannot handle a packet which lies in more than two buf */ fwdma_sync_multiseg_all(dbch->am, BUS_DMASYNC_POSTREAD); fwdma_sync_multiseg_all(dbch->am, BUS_DMASYNC_POSTWRITE); @@ -2921,7 +2926,9 @@ fwohci_arcv(struct fwohci_softc *sc, struct fwohci_dbch *dbch, int count) #endif break; } +#ifdef COUNT_PACKETS pcnt++; +#endif if (dbch->pdb_tr != NULL) { fwohci_arcv_free_buf(sc, dbch, dbch->pdb_tr, off, 1); @@ -2951,7 +2958,7 @@ out: } /* XXX make sure DMA is not dead */ } -#if 0 +#ifdef COUNT_PACKETS if (pcnt < 1) printf("fwohci_arcv: no packets\n"); #endif