From nobody Wed Jul 10 16:49:01 2024
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 4WK3j95HbDz5QmgN;
Wed, 10 Jul 2024 16:49:01 +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 "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WK3j949mrz4g3X;
Wed, 10 Jul 2024 16:49:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1720630141;
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=GmvUDM95/TKjjK7TBKCjoe3Lh9jrOWM4m4/Z34KfPNQ=;
b=iPuzJk/EwWtgvJNLdw9Z/KW78cZJXbseGG3hyn1DdG90W0yzppWrgLjp8UjRSzBpZWq9s4
CdYA4p/GO8XeOu7HXCQn7xrzQTipR23pymCps+Gk4TxBM/yhZMxtOmTlKBuDLMwUjW/40w
L6bmxV3fhex5AaBqPmB+p9A2JeRAwR0U6g43XhVVkspiKwUI02iQGeZtAse5fe8VlW3gRS
ymXdL5agvMeI3A+5TfunYWMCh08xVZjURiTP9fSFt7mbuPH+iy9UjMEJFnvCjqSZwu7rZl
3hDalJ+gyTn+5891O3U/b5KJPUurpsmOpebSVoKfRWEF8DffAyS4NhCUbopAeA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720630141; a=rsa-sha256; cv=none;
b=gNTvDKD6eWIZJdII6KEHuJcoUL1g2GWsJy3d0HOvxKRwuoBUHzOSmM8DGj55V5zkZmMw7/
o6PhISSQQWhuxAG4MtPC6zKUtUIsuBecQ/1uxCXawIcOMBd71V6FaM2/Du5YzKKXcGiFH+
//CwpgHeUU4GQq8Tnxa3w/YQbgrda1QyqieK6LY7L2FT1DDf8/596w3FZ71FmSv1sk3RZ7
ymCyJfg2DgmSjtJAPOt+pkOGvpe4pt19uKaUtghAiOsG/ds4Kd9GFnLDs89b8WX1VSDIbF
Dh8G42hjbDy8K7q9MBn66wneHRdFdt+IcReB4Gs6qFvg5oWDpG9XxIYxS+AIgA==
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=1720630141;
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=GmvUDM95/TKjjK7TBKCjoe3Lh9jrOWM4m4/Z34KfPNQ=;
b=ZdjEMyglpklwBs3Oq3NhH9MqyqfVEJoTcz53Yb3AkRf0Ai7xMAAdYfLb1s8jFMN6GZHa22
2DlT85cfxmtHnpQo45GY4+xYKquO+f6I1PQAZOC2szl5HvElyuloysT5lNR6utaW8uQuWn
luyNIfFx+qMJ1xVkUUXUgKl552r46ECuvVUlSKfRsW1+terceqEIxxDzSnjHYqM8KFHK2A
lG7sn0LDv8Us9+iDWkRsc1azZmFd+nt3Gjle6zL+sVrI/Pdi8L4y2/726kqJRZPn5qtUdX
Gf24O38sGZpu964djidwcRPjPRO7368s8WX38b9opcS+eZA69FubQJ6YvnZpAw==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WK3j93VrqzQ3N;
Wed, 10 Jul 2024 16:49:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46AGn1aG034758;
Wed, 10 Jul 2024 16:49:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46AGn1hT034755;
Wed, 10 Jul 2024 16:49:01 GMT
(envelope-from git)
Date: Wed, 10 Jul 2024 16:49:01 GMT
Message-Id: <202407101649.46AGn1hT034755@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Christos Margiolis <christos@FreeBSD.org>
Subject: git: cccdc51d98f9 - stable/14 - snd_uaudio: Remove unused
sc_sndstat sbuf
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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/14
X-Git-Reftype: branch
X-Git-Commit: cccdc51d98f9ca6bcab996830e9cecaaa4bd43e9
Auto-Submitted: auto-generated
The branch stable/14 has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=cccdc51d98f9ca6bcab996830e9cecaaa4bd43e9
commit cccdc51d98f9ca6bcab996830e9cecaaa4bd43e9
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2024-07-06 18:22:26 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2024-07-10 16:48:12 +0000
snd_uaudio: Remove unused sc_sndstat sbuf
This information is also printed to dmesg(8) on attach.
Sponsored by: The FreeBSD Foundation
MFC after: 2 days
Reviewed by: dev_submerge.ch, markj
Differential Revision: https://reviews.freebsd.org/D45771
(cherry picked from commit 3402d474ceb8541d07689bad6960f90739129997)
---
sys/dev/sound/usb/uaudio.c | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index d47eb86ed271..c202ac581119 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -368,7 +368,6 @@ struct uaudio_softc_child {
};
struct uaudio_softc {
- struct sbuf sc_sndstat;
struct sndcard_func sc_sndcard_func;
struct uaudio_chan sc_rec_chan[UAUDIO_MAX_CHILD];
struct uaudio_chan sc_play_chan[UAUDIO_MAX_CHILD];
@@ -391,7 +390,6 @@ struct uaudio_softc {
uint8_t sc_mixer_iface_index;
uint8_t sc_mixer_iface_no;
uint8_t sc_mixer_chan;
- uint8_t sc_sndstat_valid:1;
uint8_t sc_uq_audio_swap_lr:1;
uint8_t sc_uq_au_inp_async:1;
uint8_t sc_uq_au_no_xu:1;
@@ -1293,8 +1291,6 @@ uaudio_detach(device_t dev)
if (bus_generic_detach(dev) != 0) {
DPRINTF("detach failed!\n");
}
- sbuf_delete(&sc->sc_sndstat);
- sc->sc_sndstat_valid = 0;
umidi_detach(dev);
@@ -2149,15 +2145,6 @@ uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb_device *udev,
if (rate > chan->pcm_cap.maxspeed || chan->pcm_cap.maxspeed == 0)
chan->pcm_cap.maxspeed = rate;
- if (sc->sc_sndstat_valid != 0) {
- sbuf_printf(&sc->sc_sndstat, "\n\t"
- "mode %d.%d:(%s) %dch, %dbit, %s, %dHz",
- curidx, alt_index,
- (ep_dir == UE_DIR_IN) ? "input" : "output",
- channels, p_fmt->bPrecision,
- p_fmt->description, rate);
- }
-
next_ep:
sed.v1 = NULL;
ed1 = NULL;
@@ -2230,9 +2217,6 @@ uaudio_chan_fill_info(struct uaudio_softc *sc, struct usb_device *udev)
if (channels == 0)
channels = channels_max;
- if (sbuf_new(&sc->sc_sndstat, NULL, 4096, SBUF_AUTOEXTEND))
- sc->sc_sndstat_valid = 1;
-
/* try to search for a valid config */
for (x = channels; x; x--) {
@@ -2263,8 +2247,6 @@ uaudio_chan_fill_info(struct uaudio_softc *sc, struct usb_device *udev)
if (x == (channels + 1))
x--;
}
- if (sc->sc_sndstat_valid)
- sbuf_finish(&sc->sc_sndstat);
}
static void