1 files changed, 5 insertions, 48 deletions

diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index f281dff36248..adbde195c34c 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -65,11 +65,6 @@ struct snd_mixer {
 	char name[MIXER_NAMELEN];
 	struct mtx *lock;
 	oss_mixer_enuminfo enuminfo;
-	/** 
-	 * Counter is incremented when applications change any of this
-	 * mixer's controls.  A change in value indicates that persistent
-	 * mixer applications should update their displays.
-	 */
 	int modify_counter;
 };
 
@@ -609,14 +604,6 @@ mix_getparent(struct snd_mixer *m, u_int32_t dev)
 }
 
 u_int32_t
-mix_getchild(struct snd_mixer *m, u_int32_t dev)
-{
-	if (m == NULL || dev >= SOUND_MIXER_NRDEVICES)
-		return 0;
-	return m->child[dev];
-}
-
-u_int32_t
 mix_getdevs(struct snd_mixer *m)
 {
 	return m->devs;
@@ -1024,14 +1011,6 @@ mix_getrecsrc(struct snd_mixer *m)
 	return (ret);
 }
 
-int
-mix_get_type(struct snd_mixer *m)
-{
-	KASSERT(m != NULL, ("NULL snd_mixer"));
-
-	return (m->type);
-}
-
 device_t
 mix_get_dev(struct snd_mixer *m)
 {
@@ -1490,6 +1469,11 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi)
 		mi->dev = i;
 		snprintf(mi->id, sizeof(mi->id), "mixer%d", i);
 		strlcpy(mi->name, m->name, sizeof(mi->name));
+		/**
+		 * Counter is incremented when applications change any of this
+		 * mixer's controls.  A change in value indicates that
+		 * persistent mixer applications should update their displays.
+		 */
 		mi->modify_counter = m->modify_counter;
 		mi->card_number = i;
 		/*
@@ -1573,30 +1557,3 @@ mixer_get_lock(struct snd_mixer *m)
 	}
 	return (m->lock);
 }
-
-int
-mix_get_locked(struct snd_mixer *m, u_int dev, int *pleft, int *pright)
-{
-	int level;
-
-	level = mixer_get(m, dev);
-	if (level < 0) {
-		*pright = *pleft = -1;
-		return (-1);
-	}
-
-	*pleft = level & 0xFF;
-	*pright = (level >> 8) & 0xFF;
-
-	return (0);
-}
-
-int
-mix_set_locked(struct snd_mixer *m, u_int dev, int left, int right)
-{
-	int level;
-
-	level = (left & 0xFF) | ((right & 0xFF) << 8);
-
-	return (mixer_set(m, dev, m->mutedevs, level));
-}