From nobody Tue Mar 24 10:38:52 2026 X-Original-To: dev-commits-src-main@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 4fg6305s59z6WTrV for ; Tue, 24 Mar 2026 10:38:52 +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 4fg6304t0pz3tMw for ; Tue, 24 Mar 2026 10:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774348732; 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=fhA6IqdNmVLchML7lvuGTGy/Pwpb/FABsNu0+our2q8=; b=PFwdRhfgSGsQ66NHra5nmpYKISjifLncymNeT1h+KY2mStQ7QuYmicayylXpHqvTrE4bFD 3IBatsZwOzhfW0CCELv7VUJ9sehdPtRpMRY/zcXas37wVWqXlk2U7mUefvwnXAFSNBEDPe wbgtpPxFCJER9GKJZyNtvxV+aHWxfaXba5/vqOaMfgcJtWgJ1Uwy8XEUeyibdmQulSzMS6 8Ict/txSpouMH1h1qJRPNfAFCU+6omTau5ZDYA5UdgscjKQ+kJdb9EnphrJiz6TFi8UiCr nibdHJZt2NC7YwruPtYaH318tt67f/Yz3Joq4jwIXv5L0A73p34aRnvCo/86Yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774348732; a=rsa-sha256; cv=none; b=u1qWLjRUylpbc7pDt290NcxsCa0FVJNMhuwfwttiZ7I8OogmF1bceeNyXpiZDbiD3MwQH0 4dIJiLV8m3uqZqHGA4gsMO+eV1Rgl2L/BKFzsbU3dssbuHVljsBO5Aj5NDgqSKROOlgOf6 3ussFYaSOWrnD4s7ZK537BSK8tGVtr4k5BHA1pwerGLKJw1lkPfC/Q1OhOvarlfy/mJdWR EOJ9BaFXKbJ9JJzPGfu3kpwJmzkjrtR7eElUARLMkOIcdc+iD2rhrIGqdOc3PsdqEVfvBW i8fwz5YstQHgQVP3TInxABHou6BjkmU/3Tn3cGIFdJ/Qflqmx+5SQyQfWIqRBA== 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=1774348732; 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=fhA6IqdNmVLchML7lvuGTGy/Pwpb/FABsNu0+our2q8=; b=rClAVCEYgEycDgiRvuLZC+qRUS5TiP/P6h5BMNC8HzFMKh9Adm5tm06SmDAJrmjVkdlLy+ D2uo1dXQXAw87rqgXK2JaGp7pLfIr1/siJhKQGBa/e0a/8rB2QhPj2Bfb2/zkjgwv/4RMW d/cLVtFmzM8M7zrH2jarGwAvVaqmn3Lh1GYVcbeWzL0PHxyfCB3/HmEPTRmFrh/HB2WRJe /bJv11wTrwe1AXkNJklFUNBoktcHYOyzKsi7I1lzzCuGwhnE3gtd/j/9t9ofmYsz28ixZf PXeZ0wa2bUd0SBKY3fpWoQ0EyRkcIu20QQupJ7yzdkQnbZsex3GYZtEs3KDuNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fg630408mzMQ for ; Tue, 24 Mar 2026 10:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 337a2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 10:38:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: a2fd964a9582 - main - snd_uaudio: Retire UAUDIO_MAX_CHAN() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a2fd964a95829c0225031fb317202d4acc2d6ce9 Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 10:38:52 +0000 Message-Id: <69c269bc.337a2.1bdd4c79@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a2fd964a95829c0225031fb317202d4acc2d6ce9 commit a2fd964a95829c0225031fb317202d4acc2d6ce9 Author: Christos Margiolis AuthorDate: 2026-03-24 10:31:12 +0000 Commit: Christos Margiolis CommitDate: 2026-03-24 10:38:40 +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 --- 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 &&