From nobody Tue Mar 31 09:55:08 2026 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 4flNlK09fVz6Wc9Y for ; Tue, 31 Mar 2026 09:55:09 +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 4flNlJ5hQtz3kYl for ; Tue, 31 Mar 2026 09:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774950908; 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=OhaUr0tDPrmPylCBK+ofnI98J/6dVrCTBdIQ0XE6c48=; b=mP7jQhw9pNUS3mCv3hAITGTXR2hyjt38lsyUAG+wczFMpBUR2alb//xFCwIUMYpCK2iRCa 8sA4/YyX5SpZzKaA18tZTnLeKjhByywnh2W3GRjMRE3nrC9ItF8ax0GS6tq85nHFwhkZXO wfiXYMNXAQsCVr6izVyhxTptuLK2zeqzsVkfPbzdIaHAxazNWdmP1amLm71d4CtwsGrHj5 fk1pcRhCO2y8NEs8XZ4cm/ab/b08tGPK0YZuBKryBm8LArHzPnkobp9DOcbYiS2s39wqbt /haKh1VV9l6yAHJrPc8llH6ORDOUsqu+CHcxgF8RdifNED2ZUQsPl+qaQo7JYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774950908; a=rsa-sha256; cv=none; b=TWJ2fBhYtdvnx3jC9km7xDSz8M7+SpQAWXNvnHxqWW8X72dvLPCUSHkxdV/hip5FRyicS9 dZKv6QyyAJS6OMO0OcwREst+/Evt0lSfM3tgBZuo7R9wOiTe03hXjryMtlgBlOrlYicw+8 C3hBSRRzl2DWy7aN6ik0y1K3C821IZGcxglbW2M86AuezSlk6tmn1TKPZTEB93qUdOGAFy takVgX3UTFf9BCXu6Vev4HRQgldqOaTgWLNNLuhD3nuEkp6TqRTYV0ibDmiX7vFv4COaod /nporyfq0NwPiqnFOzTCG6MqcqJ6l5ANAb65D2XfYLIxdh8VGBuwRCmGuRy62w== 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=1774950908; 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=OhaUr0tDPrmPylCBK+ofnI98J/6dVrCTBdIQ0XE6c48=; b=nem+n/w1lTapsXTkTlaaJhy/NOmMpaPNyPau8u/b0Z2KJr5TXx2YBtmCxStYqRFksaCXOi wtafxk8d+knj6R2rLSUV8aTyVqg35RV5kiFHBJHqzfMKL8zxqze+Na3Fh860xcB/4VP7+U fgyTTDvX3q/XhHS6t44e+vL4GP9Hiu6it4TDKtYAMq+FCJAh5BGVMmmUa0ZMGhNjba98pz uMMf7zpdR8yEct8wewlRmQU1FIomPkLO8R27E1VSlovmaNe4bQwez58nN7rEnq99OivrQU QBfVpLYIo3HLRYzRUi3S3s1HcngAe5IltZdeCbrFDfKRz10pNjXHM9EuuxtGCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flNlJ5J1Yz8K3 for ; Tue, 31 Mar 2026 09:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c10f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 09:55:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: a7c0ee909528 - stable/15 - sound: Always use chn_getvolume_matrix() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: a7c0ee90952868a5148b9cc05339b1a2d20c00eb Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 09:55:08 +0000 Message-Id: <69cb99fc.3c10f.70782ccf@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a7c0ee90952868a5148b9cc05339b1a2d20c00eb commit a7c0ee90952868a5148b9cc05339b1a2d20c00eb Author: Christos Margiolis AuthorDate: 2026-03-24 10:31:53 +0000 Commit: Christos Margiolis CommitDate: 2026-03-31 09:53:16 +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 (cherry picked from commit 0b7f9597024a0061b1e6c544d78bc2ed9392bd89) --- 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])