From nobody Wed Jul 27 19:18:05 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 4LtNpj4rv1z4XRtk; Wed, 27 Jul 2022 19:18:05 +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 4LtNpj4BXvz3GC0; Wed, 27 Jul 2022 19:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658949485; 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=4JoaZuMT7IvUqTiE3iLAIGoF8qGCRVET1yEyJ+ZbUaY=; b=snY9DdSisvMu+0m4sgm/bSgA5mO7E1omSwbk37iv4VG2sFch+p9x7qnoUkK2CwMdqizsmQ fjyVegWNlTL0V22quxwjEWgsb5D3JbH4e9aFoXLWcozuky8IrFPirXw8D5YFp3URpOPlmD qddQFFO1B274G+htQv/wBbXf5vqVpz/hYxpoQHwNRYY9ue8ZPj/RHooqggOloVmLIeQ268 8aGPGfdygiK5TqA5p09IwAQ6FbdSasE57KhTIoaSJxKb5JnwO7TaUlRRwOn37cUY6iXIWF UUdHbHOLYVN7Oyh8fpgbRqeS7fF9SfCcZi0R+e4BZbmSJnkuFaH/Ck7UJiQfpg== 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 4LtNpj3DhLzSN5; Wed, 27 Jul 2022 19:18:05 +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 26RJI5Rt058732; Wed, 27 Jul 2022 19:18:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26RJI5ba058731; Wed, 27 Jul 2022 19:18:05 GMT (envelope-from git) Date: Wed, 27 Jul 2022 19:18:05 GMT Message-Id: <202207271918.26RJI5ba058731@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: 3e4582f80355 - stable/13 - Fix unused variable warning in mlx5_ib_devx.c 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3e4582f80355735a80370e264d07f9caff9f5d30 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658949485; 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=4JoaZuMT7IvUqTiE3iLAIGoF8qGCRVET1yEyJ+ZbUaY=; b=WCQ2Jz2ER+CN9dyYarQWyQugD3lRT88gXceE+l6B2QzaDigHZXZ5hL1doRkHh293Z7JAq4 Rc+6HBz5aVFxmkE2c6GeqfTG32kziEzprgPP1gk/sg1Q3C+Vim5pGgwmPelAYYzJHiue8m K6tShOv4gJFJKBnytz2QxRdab+LZS+XRf1Uy2+mYsp4qoNxgQg8G4k/qguf4XQHlVUXKGg Al3lw5xzcIvZaKZ9Fu5nqBo6LjbqRmawM+O0L2JAcOdOa1PdnuYHlvFW4ELdqW2lWMKPf7 MWlxKiXjcnX4Z2+H+3NcyH91JaRv3fSEUO0N0kEZG405TmTomQ4m9jorALLBrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658949485; a=rsa-sha256; cv=none; b=E1GGkcAG+gzk6mCfDdDb59vrzIlmBd+pSkTS8LpeJ4T8HdZt7pdowl3GQe7lTYvAxw+jbQ zTAZ++EQ/4LsQZSeukmW9vh0J80ZuYRAs/6qxPfGCohzzqtxAK/uGS9x7xAWQqHGMHdqsc 0SHIEr7tJ+iiD1jZORHvQ+oUku5bxpW9naEATOh2X1jrYEJjPqdNnMh9HX6HvdM0jXO2p+ PuCdyDbhlKXyY3qumCKbdIWwD9HHIQ5T+VOSNT63dDJVzHAL6NJ3ws2C4Sc6Oonzc8My3M ePMeoT8StwWCU631agH8g3UpdY4+C+eJBPf1nQPK/5D5T7RDxQLO9EJKU+aVwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3e4582f80355735a80370e264d07f9caff9f5d30 commit 3e4582f80355735a80370e264d07f9caff9f5d30 Author: Dimitry Andric AuthorDate: 2022-07-24 22:22:05 +0000 Commit: Dimitry Andric CommitDate: 2022-07-27 19:17: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 (cherry picked from commit 5ae3710aeb2a984344fbe36de71612fc1a3d1a71) --- sys/dev/mthca/mthca_cmd.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/mthca/mthca_cmd.c b/sys/dev/mthca/mthca_cmd.c index b4c0dc2f6f1d..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; +#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,