aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristos Margiolis <christos@FreeBSD.org>2026-03-24 10:31:53 +0000
committerChristos Margiolis <christos@FreeBSD.org>2026-03-24 10:38:41 +0000
commit0b7f9597024a0061b1e6c544d78bc2ed9392bd89 (patch)
treec334ba9c70b3f7dc8e767a01a19f652488c9a8ae
parent4324e0fa71f85f274013100d912584a042c9909e (diff)
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
-rw-r--r--sys/dev/sound/pcm/channel.h4
1 files changed, 0 insertions, 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])