git: 5ae3710aeb2a - main - Fix unused variable warning in mlx5_ib_devx.c
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 24 Jul 2022 22:40:45 UTC
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5ae3710aeb2a984344fbe36de71612fc1a3d1a71 commit 5ae3710aeb2a984344fbe36de71612fc1a3d1a71 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2022-07-24 22:22:05 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2022-07-24 22:40:13 +0000 Fix unused variable warning in mlx5_ib_devx.c With clang 15, the following -Werror warning is produced: sys/dev/mthca/mthca_cmd.c:662:23: error: variable 'tc' set but not used [-Werror,-Wunused-but-set-variable] int ts __unused = 0, tc = 0; ^ The 'ts' and 'tc' variables are eventually used only in mthca_dbg() macros, if CONFIG_INFINIBAND_MTHCA_DEBUG is defined. Ensure 'ts' and 'tc' are only declared and used when CONFIG_INFINIBAND_MTHCA_DEBUG is defined. MFC after: 3 days --- sys/dev/mthca/mthca_cmd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/mthca/mthca_cmd.c b/sys/dev/mthca/mthca_cmd.c index 8dcce01c061a..6924348e72e4 100644 --- a/sys/dev/mthca/mthca_cmd.c +++ b/sys/dev/mthca/mthca_cmd.c @@ -659,7 +659,9 @@ static int mthca_map_cmd(struct mthca_dev *dev, u16 op, struct mthca_icm *icm, int nent = 0; int i; int err = 0; - int ts __unused = 0, tc = 0; +#ifdef CONFIG_INFINIBAND_MTHCA_DEBUG + int ts = 0, tc = 0; +#endif /* CONFIG_INFINIBAND_MTHCA_DEBUG */ mailbox = mthca_alloc_mailbox(dev, GFP_KERNEL); if (IS_ERR(mailbox)) @@ -693,8 +695,10 @@ static int mthca_map_cmd(struct mthca_dev *dev, u16 op, struct mthca_icm *icm, pages[nent * 2 + 1] = cpu_to_be64((mthca_icm_addr(&iter) + (i << lg)) | (lg - MTHCA_ICM_PAGE_SHIFT)); +#ifdef CONFIG_INFINIBAND_MTHCA_DEBUG ts += 1 << (lg - 10); ++tc; +#endif /* CONFIG_INFINIBAND_MTHCA_DEBUG */ if (++nent == MTHCA_MAILBOX_SIZE / 16) { err = mthca_cmd(dev, mailbox->dma, nent, 0, op,