The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3612ef642f511a1bd9f759da87abeafe7d6ff110
commit 3612ef642f511a1bd9f759da87abeafe7d6ff110 Author: Christos Margiolis <[email protected]> AuthorDate: 2025-11-20 15:24:49 +0000 Commit: Christos Margiolis <[email protected]> CommitDate: 2025-11-20 15:24:49 +0000 sound: Remove vchan_passthrough() and hw.snd.passthrough_verbose Unused and confusing. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/pcm/vchan.c | 18 ------------------ sys/dev/sound/pcm/vchan.h | 5 ----- 2 files changed, 23 deletions(-) diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index b31e28d51453..dcb49e3003d0 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -47,13 +47,6 @@ #define FMTLIST_OFFSET 4 #define DIGFMTS_MAX 2 -#ifdef SND_DEBUG -static int snd_passthrough_verbose = 0; -SYSCTL_INT(_hw_snd, OID_AUTO, passthrough_verbose, CTLFLAG_RWTUN, - &snd_passthrough_verbose, 0, "passthrough verbosity"); - -#endif - struct vchan_info { struct pcm_channel *channel; struct pcmchan_caps caps; @@ -723,11 +716,7 @@ vchan_destroy(struct pcm_channel *c) } int -#ifdef SND_DEBUG -vchan_passthrough(struct pcm_channel *c, const char *caller) -#else vchan_sync(struct pcm_channel *c) -#endif { int ret; @@ -744,13 +733,6 @@ vchan_sync(struct pcm_channel *c) if (ret != 0) c->flags |= CHN_F_DIRTY; -#ifdef SND_DEBUG - if (snd_passthrough_verbose) { - device_printf(c->dev, "%s(%s/%s) %s() -> re-sync err=%d\n", - __func__, c->name, c->comm, caller, ret); - } -#endif - return (ret); } diff --git a/sys/dev/sound/pcm/vchan.h b/sys/dev/sound/pcm/vchan.h index 65b0218781fb..5d8057cd4b7f 100644 --- a/sys/dev/sound/pcm/vchan.h +++ b/sys/dev/sound/pcm/vchan.h @@ -39,12 +39,7 @@ extern bool snd_vchans_enable; int vchan_create(struct pcm_channel *, struct pcm_channel **); int vchan_destroy(struct pcm_channel *); -#ifdef SND_DEBUG -int vchan_passthrough(struct pcm_channel *, const char *); -#define vchan_sync(c) vchan_passthrough(c, __func__) -#else int vchan_sync(struct pcm_channel *); -#endif #define VCHAN_SYNC_REQUIRED(c) \ (((c)->flags & CHN_F_VIRTUAL) && (((c)->flags & CHN_F_DIRTY) || \
