From nobody Wed Apr 13 23:10:05 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 9B6E01B41EEB; Wed, 13 Apr 2022 23:10:07 +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 4Kdywt1714z4mHr; Wed, 13 Apr 2022 23:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891406; 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=liqVOwXtgCt9mj2tnZjby5xXdjtSyVsYiMRcatEHPBE=; b=TUkNAHfpWmiacV24VKv2cCmAEXRNu5FaW1UDsqEgwy+/IoncqZMYmATGu0udoTJlS8U6ed wF/CkXbPNxXdomUsSYcZXKr2wSlS39TDdapDmXJ+hgS9fqwGVVrKnXXF9TmAwFQT0BSxJN NqYPZnW503QL431+nz3yN910oZH7nR2nUIC53iSShWeo5Xlyb1evUTKSg248YwXbV34itr KpRvMQIlHhM6ta+Hq/A5U0DvgxB5T8gF5B5InfhzK1g0ZPEGuFjJs9eXlsuWrrrwoqDnWQ ZWt4ce3ThUb7GI8BbrbaUqqK/BaPssU6HoZZLgQyQA8lObK9ZgoSFwtxgkzUxQ== 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 89E5E1538A; Wed, 13 Apr 2022 23:10: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 23DNA5Va077612; Wed, 13 Apr 2022 23:10:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DNA5wD077610; Wed, 13 Apr 2022 23:10:05 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:10:05 GMT Message-Id: <202204132310.23DNA5wD077610@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: 695d3e52ea8f - main - xdma: Inline variables with simple values used once in a KASSERT(). 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 695d3e52ea8f0c118274bb8f2389e052b922a683 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891406; 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=liqVOwXtgCt9mj2tnZjby5xXdjtSyVsYiMRcatEHPBE=; b=Z1oL2w75oVHElzq/YtlN90vleVA5qcysUnZVHmDgCytc9GtyKJPEOB94/0T1UZmfD+lUzU lUvdasqN/ECZdaL+2h8kJfuBYVWm11Cb15kNA+uVAIJnUD076lrDKPibG7N0XbXOM+EbcZ 8DjaAItKfJhquCZaZ6/iEx5UaHtCZDCuJ/68ZpdLhBipXMnPCwCH8jqbt1rlrebrv0ez7J 5ScFjjohSetTR1egNWft26l61HS8b6A74ABN/oBfTTHA3pG0+q8R2xEyaREsXGPp3Ed0v9 DT8cD2aDfnw66g+u07ALTlSznC0ml98FqiJCSdJUqtP+AnSZ5iZwVq0ovVo9Rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891406; a=rsa-sha256; cv=none; b=B6JFOkGuBM0HQy2nRfVPH36YS/QxIaL4O0BMDXZvLziYiVXlSdIv9tjd/fjGaM90UYYxSn jeahDicZ+eKAK1Xj/cGSiAYCffzVan8TADC60Pf5Ke2hIzlEx20t3uTFKVjvfGpuQOdjER PUkIS7/qp0T0e8jDne5/todlUD0NMy5M63xVNGE9F0+9sa1LDRPhE+7gtdKSKmZ0dVSeoY I8kgXVvtflO/DBgDB1hWbCcq/kuIrSwyk2KQrLGTR5N5GJs/1QWqO/ntb6p/7D253ws52T exzYXuo+gaq4Isk45B9G6K8dqEEcIB5D4gVeySLAwCk889u50LcEHh9L57F+ug== 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=695d3e52ea8f0c118274bb8f2389e052b922a683 commit 695d3e52ea8f0c118274bb8f2389e052b922a683 Author: John Baldwin AuthorDate: 2022-04-13 23:08:23 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:23 +0000 xdma: Inline variables with simple values used once in a KASSERT(). --- sys/dev/xdma/xdma.c | 8 ++------ sys/dev/xdma/xdma_bank.c | 4 +--- sys/dev/xdma/xdma_queue.c | 8 ++------ 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/sys/dev/xdma/xdma.c b/sys/dev/xdma/xdma.c index 74caf6cba61c..1598886eccd6 100644 --- a/sys/dev/xdma/xdma.c +++ b/sys/dev/xdma/xdma.c @@ -265,10 +265,8 @@ xdma_teardown_all_intr(xdma_channel_t *xchan) { struct xdma_intr_handler *ih_tmp; struct xdma_intr_handler *ih; - xdma_controller_t *xdma; - xdma = xchan->xdma; - KASSERT(xdma != NULL, ("xdma is NULL")); + KASSERT(xchan->xdma != NULL, ("xdma is NULL")); TAILQ_FOREACH_SAFE(ih, &xchan->ie_handlers, ih_next, ih_tmp) { TAILQ_REMOVE(&xchan->ie_handlers, ih, ih_next); @@ -326,11 +324,9 @@ xdma_callback(xdma_channel_t *xchan, xdma_transfer_status_t *status) { struct xdma_intr_handler *ih_tmp; struct xdma_intr_handler *ih; - xdma_controller_t *xdma; struct epoch_tracker et; - xdma = xchan->xdma; - KASSERT(xdma != NULL, ("xdma is NULL")); + KASSERT(xchan->xdma != NULL, ("xdma is NULL")); TAILQ_FOREACH_SAFE(ih, &xchan->ie_handlers, ih_next, ih_tmp) { if (ih->cb != NULL) { diff --git a/sys/dev/xdma/xdma_bank.c b/sys/dev/xdma/xdma_bank.c index 14cab1224b95..dc5c882ad909 100644 --- a/sys/dev/xdma/xdma_bank.c +++ b/sys/dev/xdma/xdma_bank.c @@ -48,11 +48,9 @@ void xchan_bank_init(xdma_channel_t *xchan) { struct xdma_request *xr; - xdma_controller_t *xdma; int i; - xdma = xchan->xdma; - KASSERT(xdma != NULL, ("xdma is NULL")); + KASSERT(xchan->xdma != NULL, ("xdma is NULL")); xchan->xr_mem = malloc(sizeof(struct xdma_request) * xchan->xr_num, M_XDMA, M_WAITOK | M_ZERO); diff --git a/sys/dev/xdma/xdma_queue.c b/sys/dev/xdma/xdma_queue.c index 8e8f932fc8de..ef755747edc7 100644 --- a/sys/dev/xdma/xdma_queue.c +++ b/sys/dev/xdma/xdma_queue.c @@ -76,10 +76,8 @@ xdma_enqueue(xdma_channel_t *xchan, uintptr_t src, uintptr_t dst, enum xdma_direction dir, void *user) { struct xdma_request *xr; - xdma_controller_t *xdma; - xdma = xchan->xdma; - KASSERT(xdma != NULL, ("xdma is NULL")); + KASSERT(xchan->xdma != NULL, ("xdma is NULL")); xr = xchan_bank_get(xchan); if (xr == NULL) @@ -107,11 +105,9 @@ xdma_enqueue(xdma_channel_t *xchan, uintptr_t src, uintptr_t dst, int xdma_queue_submit(xdma_channel_t *xchan) { - xdma_controller_t *xdma; int ret; - xdma = xchan->xdma; - KASSERT(xdma != NULL, ("xdma is NULL")); + KASSERT(xchan->xdma != NULL, ("xdma is NULL")); ret = 0;