Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Apr 2022 23:10:02 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 216536350af0 - main - vnic: Use __diagused for variables only used in KASSERT().
Message-ID:  <202204132310.23DNA2Vf076964@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=216536350af0c3d2f4a99807f461b099a091f835

commit 216536350af0c3d2f4a99807f461b099a091f835
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-04-13 23:08:23 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-04-13 23:08:23 +0000

    vnic: Use __diagused for variables only used in KASSERT().
---
 sys/dev/vnic/nicvf_main.c   | 2 +-
 sys/dev/vnic/nicvf_queues.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/dev/vnic/nicvf_main.c b/sys/dev/vnic/nicvf_main.c
index 1dc49ee855a9..0794c7d53113 100644
--- a/sys/dev/vnic/nicvf_main.c
+++ b/sys/dev/vnic/nicvf_main.c
@@ -1251,7 +1251,7 @@ nicvf_release_all_interrupts(struct nicvf *nic)
 {
 	struct resource *res;
 	int irq;
-	int err;
+	int err __diagused;
 
 	/* Free registered interrupts */
 	for (irq = 0; irq < nic->num_vec; irq++) {
diff --git a/sys/dev/vnic/nicvf_queues.c b/sys/dev/vnic/nicvf_queues.c
index bb3eacb75fad..6cb939fdcc25 100644
--- a/sys/dev/vnic/nicvf_queues.c
+++ b/sys/dev/vnic/nicvf_queues.c
@@ -161,7 +161,7 @@ static int
 nicvf_alloc_q_desc_mem(struct nicvf *nic, struct q_desc_mem *dmem,
     int q_len, int desc_size, int align_bytes)
 {
-	int err, err_dmat;
+	int err, err_dmat __diagused;
 
 	/* Create DMA tag first */
 	err = bus_dma_tag_create(
@@ -231,7 +231,7 @@ dmamem_fail:
 static void
 nicvf_free_q_desc_mem(struct nicvf *nic, struct q_desc_mem *dmem)
 {
-	int err;
+	int err __diagused;
 
 	if ((dmem == NULL) || (dmem->base == NULL))
 		return;
@@ -438,7 +438,7 @@ nicvf_free_rbdr(struct nicvf *nic, struct rbdr *rbdr)
 	struct rbuf_info *rinfo;
 	bus_addr_t buf_addr;
 	int head, tail, idx;
-	int err;
+	int err __diagused;
 
 	qs = nic->qs;
 
@@ -1142,7 +1142,7 @@ nicvf_free_snd_queue(struct nicvf *nic, struct snd_queue *sq)
 {
 	struct queue_set *qs = nic->qs;
 	size_t i;
-	int err;
+	int err __diagused;
 
 	if (sq == NULL)
 		return;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204132310.23DNA2Vf076964>