aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/sound/pcm/vchan.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/sound/pcm/vchan.c')
-rw-r--r--sys/dev/sound/pcm/vchan.c22
1 files changed, 2 insertions, 20 deletions
diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c
index 31a4f7db8d70..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;
@@ -492,7 +485,7 @@ sysctl_dev_pcm_vchanrate(SYSCTL_HANDLER_ARGS)
}
}
}
- *vchanrate = sndbuf_getspd(c->bufsoft);
+ *vchanrate = c->bufsoft->spd;
CHN_UNLOCK(c);
}
@@ -591,7 +584,7 @@ sysctl_dev_pcm_vchanformat(SYSCTL_HANDLER_ARGS)
}
}
}
- *vchanformat = sndbuf_getfmt(c->bufsoft);
+ *vchanformat = c->bufsoft->fmt;
CHN_UNLOCK(c);
}
@@ -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);
}