sound: Retire SND_DEBUG

Not useful anymore.

Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Reviewed by:	markj
Differential Revision:	https://reviews.freebsd.org/D55932

4 files changed, 1 insertions, 23 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 98c63d9bb7f7..adcaf4699c19 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2157,10 +2157,6 @@ envvar		hint.gusc.0.flags="0x13"
 #
 # Following options are intended for debugging/testing purposes:
 #
-# SND_DEBUG                    Enable extra debugging code that includes
-#                              sanity checking and possible increase of
-#                              verbosity.
-#
 # SND_DIAGNOSTIC               Similar in a spirit of INVARIANTS/DIAGNOSTIC,
 #                              zero tolerance against inconsistencies.
 #
@@ -2182,7 +2178,6 @@ envvar		hint.gusc.0.flags="0x13"
 # SND_OLDSTEREO                Only 2 channels are allowed, effectively
 #                              disabling multichannel processing.
 #
-options 	SND_DEBUG
 options 	SND_DIAGNOSTIC
 options 	SND_FEEDER_MULTIFORMAT
 options 	SND_FEEDER_FULL_MULTIFORMAT
diff --git a/sys/conf/options b/sys/conf/options
index 4aeb15a489ea..d3890d5b3a9e 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -915,7 +915,6 @@ CFI_ARMEDANDDANGEROUS	opt_cfi.h
 CFI_HARDWAREBYTESWAP	opt_cfi.h
 
 # Sound options
-SND_DEBUG		opt_snd.h
 SND_DIAGNOSTIC		opt_snd.h
 SND_FEEDER_MULTIFORMAT	opt_snd.h
 SND_FEEDER_FULL_MULTIFORMAT	opt_snd.h
diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c
index 4ec50d810253..8129d7e90bfd 100644
--- a/sys/dev/sound/pcm/feeder_chain.c
+++ b/sys/dev/sound/pcm/feeder_chain.c
@@ -126,7 +126,7 @@ static uint32_t *feeder_chain_formats[FEEDER_CHAIN_LAST] = {
 
 static int feeder_chain_mode = FEEDER_CHAIN_DEFAULT;
 
-#if defined(_KERNEL) && defined(SND_DEBUG) && defined(SND_FEEDER_FULL_MULTIFORMAT)
+#if defined(_KERNEL) && defined(SND_FEEDER_FULL_MULTIFORMAT)
 SYSCTL_INT(_hw_snd, OID_AUTO, feeder_chain_mode, CTLFLAG_RWTUN,
     &feeder_chain_mode, 0,
     "feeder chain mode "
diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c
index 8c58e1c8ef33..13342094966b 100644
--- a/sys/dev/sound/pcm/feeder_mixer.c
+++ b/sys/dev/sound/pcm/feeder_mixer.c
@@ -174,14 +174,6 @@ feed_mixer_rec(struct pcm_channel *c)
 			CHN_UNLOCK(ch);
 			continue;
 		}
-#ifdef SND_DEBUG
-		if ((c->flags & CHN_F_DIRTY) && VCHAN_SYNC_REQUIRED(ch)) {
-			if (vchan_sync(ch) != 0) {
-				CHN_UNLOCK(ch);
-				continue;
-			}
-		}
-#endif
 		bs = ch->bufsoft;
 		if (ch->flags & CHN_F_MMAP)
 			sndbuf_dispose(bs, NULL, sndbuf_getready(bs));
@@ -270,14 +262,6 @@ feed_mixer_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b,
 			CHN_UNLOCK(ch);
 			continue;
 		}
-#ifdef SND_DEBUG
-		if ((c->flags & CHN_F_DIRTY) && VCHAN_SYNC_REQUIRED(ch)) {
-			if (vchan_sync(ch) != 0) {
-				CHN_UNLOCK(ch);
-				continue;
-			}
-		}
-#endif
 		if ((ch->flags & CHN_F_MMAP) && !(ch->flags & CHN_F_CLOSING))
 			sndbuf_acquire(ch->bufsoft, NULL,
 			    sndbuf_getfree(ch->bufsoft));