sound: Retire unused {pcm_feederdesc,feedertab_entry}->idx

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

8 files changed, 13 insertions, 20 deletions

diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 2ec0ee6fb3fd..3f6b35c9197d 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -48,8 +48,6 @@ struct feedertab_entry {
 	SLIST_ENTRY(feedertab_entry) link;
 	struct feeder_class *feederclass;
 	struct pcm_feederdesc *desc;
-
-	int idx;
 };
 static SLIST_HEAD(, feedertab_entry) feedertab;
 static int feedercnt = 0;
@@ -69,7 +67,6 @@ feeder_register_root(void *p)
 	fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO);
 	fte->feederclass = fc;
 	fte->desc = NULL;
-	fte->idx = feedercnt;
 	SLIST_INSERT_HEAD(&feedertab, fte, link);
 	feedercnt++;
 }
@@ -92,8 +89,6 @@ feeder_register(void *p)
 		fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO);
 		fte->feederclass = fc;
 		fte->desc = &fc->desc[i];
-		fte->idx = feedercnt;
-		fte->desc->idx = feedercnt;
 		SLIST_INSERT_HEAD(&feedertab, fte, link);
 		i++;
 	}
@@ -156,7 +151,6 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc)
 		f->desc->in = 0;
 		f->desc->out = 0;
 		f->desc->flags = 0;
-		f->desc->idx = 0;
 	}
 
 	err = FEEDER_INIT(f);
@@ -394,7 +388,7 @@ feeder_printchain(struct pcm_feeder *head)
 	printf("feeder chain (head @%p)\n", head);
 	f = head;
 	while (f != NULL) {
-		printf("%s/%d @ %p\n", f->class->name, f->desc->idx, f);
+		printf("%s @ %p\n", f->class->name, f);
 		f = f->source;
 	}
 	printf("[end]\n\n");
diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h
index 60b8280e59ef..e417d68fea71 100644
--- a/sys/dev/sound/pcm/feeder.h
+++ b/sys/dev/sound/pcm/feeder.h
@@ -31,7 +31,6 @@ struct pcm_feederdesc {
 	u_int32_t type;
 	u_int32_t in, out;
 	u_int32_t flags;
-	int idx;
 };
 
 struct feeder_class {
diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c
index 23e27b922486..88a083a3bfd1 100644
--- a/sys/dev/sound/pcm/feeder_eq.c
+++ b/sys/dev/sound/pcm/feeder_eq.c
@@ -420,8 +420,8 @@ feed_eq_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b,
 }
 
 static struct pcm_feederdesc feeder_eq_desc[] = {
-	{ FEEDER_EQ, 0, 0, 0, 0 },
-	{ 0, 0, 0, 0, 0 }
+	{ FEEDER_EQ, 0, 0, 0 },
+	{ 0, 0, 0, 0 }
 };
 
 static kobj_method_t feeder_eq_methods[] = {
diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c
index 0feac43374b8..c9679cfeba44 100644
--- a/sys/dev/sound/pcm/feeder_format.c
+++ b/sys/dev/sound/pcm/feeder_format.c
@@ -173,8 +173,8 @@ feed_format_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b,
 }
 
 static struct pcm_feederdesc feeder_format_desc[] = {
-	{ FEEDER_FORMAT, 0, 0, 0, 0 },
-	{ 0, 0, 0, 0, 0 }
+	{ FEEDER_FORMAT, 0, 0, 0 },
+	{ 0, 0, 0, 0 }
 };
 
 static kobj_method_t feeder_format_methods[] = {
diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c
index 43258a311d82..a0af32b887ce 100644
--- a/sys/dev/sound/pcm/feeder_matrix.c
+++ b/sys/dev/sound/pcm/feeder_matrix.c
@@ -399,8 +399,8 @@ feed_matrix_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b,
 }
 
 static struct pcm_feederdesc feeder_matrix_desc[] = {
-	{ FEEDER_MATRIX, 0, 0, 0, 0 },
-	{ 0, 0, 0, 0, 0 }
+	{ FEEDER_MATRIX, 0, 0, 0 },
+	{ 0, 0, 0, 0 }
 };
 
 static kobj_method_t feeder_matrix_methods[] = {
diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c
index ab67a14711d3..028e9366aa8e 100644
--- a/sys/dev/sound/pcm/feeder_mixer.c
+++ b/sys/dev/sound/pcm/feeder_mixer.c
@@ -359,8 +359,8 @@ feed_mixer_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b,
 }
 
 static struct pcm_feederdesc feeder_mixer_desc[] = {
-	{ FEEDER_MIXER, 0, 0, 0, 0 },
-	{ 0, 0, 0, 0, 0 }
+	{ FEEDER_MIXER, 0, 0, 0 },
+	{ 0, 0, 0, 0 }
 };
 
 static kobj_method_t feeder_mixer_methods[] = {
diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c
index 9c29142b9d6b..166165e95e65 100644
--- a/sys/dev/sound/pcm/feeder_rate.c
+++ b/sys/dev/sound/pcm/feeder_rate.c
@@ -1706,8 +1706,8 @@ z_resampler_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b,
 }
 
 static struct pcm_feederdesc feeder_rate_desc[] = {
-	{ FEEDER_RATE, 0, 0, 0, 0 },
-	{ 0, 0, 0, 0, 0 },
+	{ FEEDER_RATE, 0, 0, 0 },
+	{ 0, 0, 0, 0 },
 };
 
 static kobj_method_t feeder_rate_methods[] = {
diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c
index ddcbf29804f3..119ab1b288d8 100644
--- a/sys/dev/sound/pcm/feeder_volume.c
+++ b/sys/dev/sound/pcm/feeder_volume.c
@@ -307,8 +307,8 @@ feed_volume_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b,
 }
 
 static struct pcm_feederdesc feeder_volume_desc[] = {
-	{ FEEDER_VOLUME, 0, 0, 0, 0 },
-	{ 0, 0, 0, 0, 0 }
+	{ FEEDER_VOLUME, 0, 0, 0 },
+	{ 0, 0, 0, 0 }
 };
 
 static kobj_method_t feeder_volume_methods[] = {