From nobody Thu Apr 21 21:04:34 2022 X-Original-To: dev-commits-src-main@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 7A91A13A28FB; Thu, 21 Apr 2022 21:04:35 +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 4KkqmM1XFlz3qTT; Thu, 21 Apr 2022 21:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650575075; 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=YhkcpqhfkJEDYSymWINef8vRu1lfVWaXvnUYAz2dZLg=; b=sxOOIh4M/jJqnqmbbbyukeCbWy+ekwTbu3ZmwzStHmhMhoe9Bo4bBf6/Q2Zg8ao9ubQpnD IVhpXAbXXB+/VMl/mYX1+0MzmMNR7pqME00kYbo9YodDIbIl42NmtPxmQxtqRMVpqzczZm dZ1OzytbVNhXdMtldIpUzFFBT4ViaIWQFsl9airVsRmO4USoH3UC0H7PMvge2aSWDo33l+ W1/2PzhdlMwPlxTKqOWy/uRdpXYY13vE2VT9wMYSpV2FLVUQdyiOo2coVftDgnCF227m4L 0XldzOsl9SVy6EScshiGIbfI5s7R29gD2zi9FYKboOLJwbz6YQxxDcQMFXYFjA== 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 14532104BD; Thu, 21 Apr 2022 21:04:35 +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 23LL4YKl098851; Thu, 21 Apr 2022 21:04:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23LL4Yfj098850; Thu, 21 Apr 2022 21:04:34 GMT (envelope-from git) Date: Thu, 21 Apr 2022 21:04:34 GMT Message-Id: <202204212104.23LL4Yfj098850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d96f81b0c5ae - main - qlxge: Inline the one use of a variable only used in a debug trace. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d96f81b0c5ae02aae3225e62dddc7ec39f1096af Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650575075; 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=YhkcpqhfkJEDYSymWINef8vRu1lfVWaXvnUYAz2dZLg=; b=hQLVkq44JXSz6VWMKJ1xSrv4kXy+an21bhhwE3H7QUVVM2c1byuONaKt5nE2ZSJtS5t1d9 C+apA1HbnCYcZn53vEA20sswEs84TJ1fmPiHRwSQbAnB44GFVl9ygE0KeI3a0abnQ3ra+n axmwbuXWJjBb1MRzJbyD0kjyQ3Ic6RHtoPiOkJx+CdEmXDuHJiX7+rYlzjIrCtFuRCMc3H 21tdUEClpMUIid4YjD4l2BVQP5m7ukYWiD8UNFSnzfPO2ELF4KPlwPKC662lSmQp0idNek lKaR6lblJuBgTqxJWLcqCeyg1LdOIp4fj4XVbPQwNQmfLSRimJQyvdw5TfUu4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650575075; a=rsa-sha256; cv=none; b=r1pT8SsVeW16BMBPO1mxfNyYMAhqDAn53trEYP2ddN/mRPCh3vfsbLY6lzsso5unlhuMoU JiW8rm1JPGbZg6l2/WSS4aXxRMRcQJNjFY/A/GfBFSlmdmY132qV2mxpMWDtSV1rOG+zWn SrQ8hObUGwgXFB19ZTRtKazp1GaLsKzOXt348Y0/xPh7ZJ3ookDOjGCOhTZhUR5gUGL9Pp D7C5HCKepPexm3bTnFofk7zqX/8jFtxVPSHtUZ8aaTOAVFsMbqtUg+RLm7SAE4XrvT3Mqk ZdW3V3WmWzrfO097lgxRU8bQI6P4dYEtsttkwX9tmkvFNAsl3Ysf68j8IIfgKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d96f81b0c5ae02aae3225e62dddc7ec39f1096af commit d96f81b0c5ae02aae3225e62dddc7ec39f1096af Author: John Baldwin AuthorDate: 2022-04-21 21:01:02 +0000 Commit: John Baldwin CommitDate: 2022-04-21 21:01:02 +0000 qlxge: Inline the one use of a variable only used in a debug trace. The other QL_DPRINT*() invocations in qls_init_hw_if() all used the expanded form instead of the local variable. The module build always defines QL_DBG in CFLAGS so doesn't trip over this, but adding qlxge to a kernel config builds without QL_DBG. Reported by: olivier --- sys/dev/qlxge/qls_hw.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/qlxge/qls_hw.c b/sys/dev/qlxge/qls_hw.c index 0fda6da46ebc..3cb2656a1cd5 100644 --- a/sys/dev/qlxge/qls_hw.c +++ b/sys/dev/qlxge/qls_hw.c @@ -808,15 +808,12 @@ qls_del_hw_if(qla_host_t *ha) int qls_init_hw_if(qla_host_t *ha) { - device_t dev; uint32_t value; int ret = 0; int i; QL_DPRINT2((ha->pci_dev, "%s:enter\n", __func__)); - dev = ha->pci_dev; - ret = qls_hw_reset(ha); if (ret) goto qls_init_hw_if_exit; @@ -929,7 +926,8 @@ qls_init_hw_if(qla_host_t *ha) Q81_WR_LBQ_PROD_IDX(i, ha->rx_ring[i].lbq_in); Q81_WR_SBQ_PROD_IDX(i, ha->rx_ring[i].sbq_in); - QL_DPRINT2((dev, "%s: [wq_idx, cq_idx, lbq_idx, sbq_idx]" + QL_DPRINT2((ha->pci_dev, + "%s: [wq_idx, cq_idx, lbq_idx, sbq_idx]" "[0x%08x, 0x%08x, 0x%08x, 0x%08x]\n", __func__, Q81_RD_WQ_IDX(i), Q81_RD_CQ_IDX(i), Q81_RD_LBQ_IDX(i), Q81_RD_SBQ_IDX(i)));