From nobody Tue Mar 24 10:39:02 2026 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 4fg63C0ZZbz6WTx3 for ; Tue, 24 Mar 2026 10:39:03 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fg63B4VJhz3tfc for ; Tue, 24 Mar 2026 10:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774348742; 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=49JB1EYtRTZZrv1gMOMnzpeGoGw4jBPpMglcEfhVaJE=; b=OPutUZ4P4AH6IL/mzQ+AAlIwbtPDle3WSzPcbF4PZaD0NzSf2trzSVkKdQ3jKYrrIXemOm cJbYi4L8SK/tww7HCNR/ZW+TUYdCW7liX/ZojCAnQxtKJ6IBbO6Lidj1zx4FQQU4nvnQ8R X+Rhb+mYA3/Bpk7immlXvSAOlatqII21rNMylPKdR1nyCG/DwwgFitvV7M/apTLYiDN1Yb 03kV+2iYdH+qjnvzGohQiyCBVeVB1xHvAAmr6i5gB+3gadJ7WL81iOaGsTdZO6Jta4D9yI m1Zl62W75cNkuE4P7kQgv02c0YtA7bo6JYnOHbOTjXJ1+yNebGgiDZ2yPE1dXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774348742; a=rsa-sha256; cv=none; b=mVickomJFcVAgr0b3cYgcN0vUGhZORkSMAW5X7NnQ+BzAtOG/8Zb7ZZ1nzskZ+pPokJHml QhlOYDHumyq+yNL5Xz8cjPDNzHmhyaucXnkQ5SxMECMmhM9xmLPdWx6W/HyqYgFbDHApaU AzYGP2PimTFP5avcogm5Pjnyj5WKV9EqUYqtUjlXIFnYplg8WBWcDtg7dhRDhqXj+9j0Hc Qvh/kl28aF17lfYlGqa9qrf/2J6BGJiRqckVNThP177vC0nKBz95f0ppjSpqyQ8IAbg3Vg 2WhPB7x8hZ9xbnPz1UPXWRkEQ6AmAe7nARl+md3EAIJ0bKCzxbMmolm7Zigwxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774348742; 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=49JB1EYtRTZZrv1gMOMnzpeGoGw4jBPpMglcEfhVaJE=; b=uXf1iITKcX7rwDuBJU/9sj2TjeNVWw6lcOuMaXBfU3dpICMvdB9CLhGXdwJCv1e1RCcSz6 9uhGhhcwHoIg6dRJnHh+HyrY/loO+Z65YnR8ODetSkWc305MU5hwVPZopvR6Ol3ZL/yYQT 6ef7107UcB6MdoNebHmekOBn8bzXQ2smcaTW7+vCqXCcwJqfYpABj+SjjBYTB2Gij3tOoh s+GLJ6awbR6s+lJm7ZeVczK+TkrTr2l1cbiTRcllF5hJsI/p8ntfg9roU3Pz5LwtyEBAaX F8VuuNHb1ANR1a+G3b8BT02xjCUeVLYuNiDsd5wwzH1LRTjDYaWQiHOc3/1qJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fg63B42FSzsB for ; Tue, 24 Mar 2026 10:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3381d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 10:39:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 0b7f9597024a - main - sound: Always use chn_getvolume_matrix() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b7f9597024a0061b1e6c544d78bc2ed9392bd89 Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 10:39:02 +0000 Message-Id: <69c269c6.3381d.68e4b9d4@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0b7f9597024a0061b1e6c544d78bc2ed9392bd89 commit 0b7f9597024a0061b1e6c544d78bc2ed9392bd89 Author: Christos Margiolis AuthorDate: 2026-03-24 10:31:53 +0000 Commit: Christos Margiolis CommitDate: 2026-03-24 10:38:41 +0000 sound: Always use chn_getvolume_matrix() There is no reason not to use it. We do it already with CHN_SETVOLUME(). chn_getvolume_matrix() is the same as the non-INVARIANTS CHN_GETVOLUME(), just without the additional KASSERT chn_getvolume_matrix() provides. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55990 --- sys/dev/sound/pcm/channel.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 6415f5c88984..0ccce2971c3a 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -307,11 +307,7 @@ int chn_getrates(struct pcm_channel *c, int **rates); int chn_syncdestroy(struct pcm_channel *c); #define CHN_SETVOLUME(...) chn_setvolume_matrix(__VA_ARGS__) -#if defined(SND_DIAGNOSTIC) || defined(INVARIANTS) #define CHN_GETVOLUME(...) chn_getvolume_matrix(__VA_ARGS__) -#else -#define CHN_GETVOLUME(x, y, z) ((x)->volume[y][z]) -#endif #define CHN_GETMUTE(x, y, z) ((x)->muted[y][z])