git: 9b322a2c39bf - stable/15 - sound: Retire CHN_GETVOLUME() and use chn_getvolume_matrix()

The branch stable/15 has been updated by christos:

URL: https://cgit.FreeBSD.org/src/commit/?id=9b322a2c39bf753ab1b6b80911f9f5aee8e9d0ab

commit 9b322a2c39bf753ab1b6b80911f9f5aee8e9d0ab
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-03-24 10:31:59 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-03-31 09:53:17 +0000

    sound: Retire CHN_GETVOLUME() and use chn_getvolume_matrix()
    
    CHN_GETVOLUME() is just a wrapped around chn_getvolume_matrix() anyway,
    so use it directly.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Reviewed by:    markj
    Differential Revision:  https://reviews.freebsd.org/D55991
    
    (cherry picked from commit f190fad18c385c184cb3600b7e24a362858a1911)
---
 sys/dev/sound/pcm/channel.h | 1 -
 sys/dev/sound/pcm/dsp.c     | 8 ++++----
 sys/dev/sound/pcm/mixer.c   | 4 ++--
 sys/dev/sound/sndstat.c     | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
index 0ccce2971c3a..22c2bf5a4d3e 100644
--- a/sys/dev/sound/pcm/channel.h
+++ b/sys/dev/sound/pcm/channel.h
@@ -307,7 +307,6 @@ int chn_getrates(struct pcm_channel *c, int **rates);
 int chn_syncdestroy(struct pcm_channel *c);
 
 #define CHN_SETVOLUME(...)		chn_setvolume_matrix(__VA_ARGS__)
-#define CHN_GETVOLUME(...)		chn_getvolume_matrix(__VA_ARGS__)
 
 #define CHN_GETMUTE(x, y, z)		((x)->muted[y][z])
 
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index c1e836691ac7..4af0430feca9 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -618,17 +618,17 @@ dsp_ioctl_channel(struct dsp_cdevpriv *priv, struct pcm_channel *ch,
 		case SOUND_MIXER_PCM:
 			if (ch->direction != PCMDIR_PLAY)
 				break;
-			*(int *)arg = CHN_GETVOLUME(ch,
+			*(int *)arg = chn_getvolume_matrix(ch,
 			    SND_VOL_C_PCM, SND_CHN_T_FL);
-			*(int *)arg |= CHN_GETVOLUME(ch,
+			*(int *)arg |= chn_getvolume_matrix(ch,
 			    SND_VOL_C_PCM, SND_CHN_T_FR) << 8;
 			break;
 		case SOUND_MIXER_RECLEV:
 			if (ch->direction != PCMDIR_REC)
 				break;
-			*(int *)arg = CHN_GETVOLUME(ch,
+			*(int *)arg = chn_getvolume_matrix(ch,
 			    SND_VOL_C_PCM, SND_CHN_T_FL);
-			*(int *)arg |= CHN_GETVOLUME(ch,
+			*(int *)arg |= chn_getvolume_matrix(ch,
 			    SND_VOL_C_PCM, SND_CHN_T_FR) << 8;
 			break;
 		case SOUND_MIXER_DEVMASK:
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index 55b61ccb4911..6ed2d0c3ce5c 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -1142,9 +1142,9 @@ mixer_ioctl_channel_proc:
 		center = (left + right) >> 1;
 		chn_setvolume_multi(c, SND_VOL_C_PCM, left, right, center);
 	} else if ((cmd & ~0xff) == MIXER_READ(0)) {
-		*(int *)arg = CHN_GETVOLUME(c, SND_VOL_C_PCM, SND_CHN_T_FL);
+		*(int *)arg = chn_getvolume_matrix(c, SND_VOL_C_PCM, SND_CHN_T_FL);
 		*(int *)arg |=
-		    CHN_GETVOLUME(c, SND_VOL_C_PCM, SND_CHN_T_FR) << 8;
+		    chn_getvolume_matrix(c, SND_VOL_C_PCM, SND_CHN_T_FR) << 8;
 	}
 
 	CHN_UNLOCK(c);
diff --git a/sys/dev/sound/sndstat.c b/sys/dev/sound/sndstat.c
index b0ac7f7d0824..c28a932c784e 100644
--- a/sys/dev/sound/sndstat.c
+++ b/sys/dev/sound/sndstat.c
@@ -487,9 +487,9 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip)
 		    c->feedcount);
 		nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_XRUNS, c->xruns);
 		nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_LEFTVOL,
-		    CHN_GETVOLUME(c, SND_VOL_C_PCM, SND_CHN_T_FL));
+		    chn_getvolume_matrix(c, SND_VOL_C_PCM, SND_CHN_T_FL));
 		nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_RIGHTVOL,
-		    CHN_GETVOLUME(c, SND_VOL_C_PCM, SND_CHN_T_FR));
+		    chn_getvolume_matrix(c, SND_VOL_C_PCM, SND_CHN_T_FR));
 		nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_HWBUF_FORMAT,
 		    c->bufhard->fmt);
 		nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_HWBUF_RATE,