From nobody Tue Mar 31 09:54:58 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 4flNl7234pz6WcCd for ; Tue, 31 Mar 2026 09:54:59 +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 4flNl66V6Cz3k8P for ; Tue, 31 Mar 2026 09:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774950898; 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=onRpuwAVJCwawgWZSx9nl+ddCN6cyDouHwGDw/mvJ0w=; b=fDlQSYoTatdjtGra0RsD2fQGali1IOyIJvE5O+GxQ4iaCBdUM+iPHtIx9Au2R6FJwbV1Vy mws6G67xwa/SpAOjjsYJa43UQje3ZqIpqCbrjUcCirnRf5dxgRWBI6MByr6gz9QRfwuThm /GjzdvV8ieIzITgakTImYWW7zy3dWguzsxPVHLv075PIPGQB+9TW4PuN1J9HUXHxdaLojK oz0dWg7LX1ZaPt8iWA6xGIec6DRx1QUDjtYIAfafYPOXxIiUQrLIwNRORp8+vWXo+8VITC 31bUl0i4DoVtwZYlfvvKK473EJVaCWoVsqXLPiVb2t5FjN1ffn8gQuEVGx0POA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774950898; a=rsa-sha256; cv=none; b=mXaM9RXsDNnBywllti5gm2eogDzSNfuX9N3aDFn+x43XCNPV0V6x7NEhdkUpCOpOsZanwu M1h17VV3zzMYaZFWKlzqK767ado8XM30BCoKy/3SIy0RMc40h9scAC4rVma1PYKUGx/UR/ uzf561SSOiftveMMeklA+8pVZb22OHh/v5EG+LBZAZehFiO2FFtn68kN1rREMo4Vrk2Sa1 MDwX4MzPS5NfckGaP2ezf8Eef/DnQr94hbRTmAyRHIktmou/CXujCuOnQZ/EtJmfjMXYNe dvssBNxiI+G/643tAbc6UUZTd/ennIOuw5UKi4M4J1pS7LOsPz33vMeFMMAM5w== 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=1774950898; 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=onRpuwAVJCwawgWZSx9nl+ddCN6cyDouHwGDw/mvJ0w=; b=d9ev9YvIHsdsR87qURF1UVjNpl685VLLPOhz0aIbDjy+YFTyP3dA8J4FKIxYBx4qUC2Qi4 hAWxui2Ukfk+BU4T7OlDkAQb8ZbIaFDRDYYqW1J+s9Ly+R1w4FQG78S5ze8H0qmBrknW0R rJdVhf91FYwwr1K9DMTbDdfRQKO1Vm+jht9Gx+TuF41wruZbwjunNOdT1e2t3IsQb0Xoro rCKgrf4sGZczQ7LzTKYVhyplkJYWa/hssscTngaX0MfVEWzcsKBv86du5Ku6qIC6fBGv+8 +whBlE7ZLVkDSkBQPjPgw3jETQmr01G6j6473BQK2r3IIC7UXmvMkCQSPVYGfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flNl65sphz8K1 for ; Tue, 31 Mar 2026 09:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cdbf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 09:54:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 5c358d5a792d - stable/15 - snd_uaudio: Retire UAUDIO_MAX_CHAN() 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: 5c358d5a792d4ee76af2fa06cd17b8e3a0d3a772 Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 09:54:58 +0000 Message-Id: <69cb99f2.3cdbf.c039caf@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5c358d5a792d4ee76af2fa06cd17b8e3a0d3a772 commit 5c358d5a792d4ee76af2fa06cd17b8e3a0d3a772 Author: Christos Margiolis AuthorDate: 2026-03-24 10:31:12 +0000 Commit: Christos Margiolis 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 &&