git: 5c358d5a792d - stable/15 - snd_uaudio: Retire UAUDIO_MAX_CHAN()

The branch stable/15 has been updated by christos:

URL: https://cgit.FreeBSD.org/src/commit/?id=5c358d5a792d4ee76af2fa06cd17b8e3a0d3a772

commit 5c358d5a792d4ee76af2fa06cd17b8e3a0d3a772
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-03-24 10:31:12 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-03-31 09:53:16 +0000

    snd_uaudio: Retire UAUDIO_MAX_CHAN()
    
    It's a no-op.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D55924
    
    (cherry picked from commit a2fd964a95829c0225031fb317202d4acc2d6ce9)
---
 sys/dev/sound/usb/uaudio.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index b74cba611b24..dd8aa8c9fafe 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -155,7 +155,6 @@ SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, debug, CTLFLAG_RWTUN,
 
 #define	MAKE_WORD(h,l) (((h) << 8) | (l))
 #define	BIT_TEST(bm,bno) (((bm)[(bno) / 8] >> (7 - ((bno) % 8))) & 1)
-#define	UAUDIO_MAX_CHAN(x) (x)
 #define	MIX(sc) ((sc)->sc_mixer_node)
 
 union uaudio_asid {
@@ -1993,7 +1992,7 @@ uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb_device *udev,
 			uint16_t wFormat;
 
 			wFormat = UGETW(asid.v1->wFormatTag);
-			bChannels = UAUDIO_MAX_CHAN(asf1d.v1->bNrChannels);
+			bChannels = asf1d.v1->bNrChannels;
 			bBitResolution = asf1d.v1->bSubFrameSize * 8;
 
 			if (asf1d.v1->bSamFreqType == 0) {
@@ -2074,8 +2073,7 @@ uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb_device *udev,
 		else
 			chan_alt->usb_cfg = uaudio_cfg_play;
 
-		chan_alt->sample_size = (UAUDIO_MAX_CHAN(channels) *
-		    p_fmt->bPrecision) / 8;
+		chan_alt->sample_size = (channels * p_fmt->bPrecision) / 8;
 		chan_alt->channels = channels;
 
 		if (ep_dir == UE_DIR_IN &&