sound: Retire feeder_class->data

It's always NULL. No functional change intended.

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

8 files changed, 8 insertions, 11 deletions

diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 6f7b225af3b9..f55c3e5992e1 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -88,7 +88,7 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc)
 	if (f == NULL)
 		return NULL;
 
-	f->data = fc->data;
+	f->data = NULL;
 	f->source = NULL;
 	f->parent = NULL;
 	f->class = fc;
@@ -401,7 +401,6 @@ static struct feeder_class feeder_root_class = {
 	.methods =	feeder_root_methods,
 	.size =		sizeof(struct pcm_feeder),
 	.desc =		{ FEEDER_ROOT, 0, 0 },
-	.data =		NULL,
 };
 /*
  * Register the root feeder first so that pcm_addchan() and subsequent
diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h
index 5ac92bf13735..f89652ab9635 100644
--- a/sys/dev/sound/pcm/feeder.h
+++ b/sys/dev/sound/pcm/feeder.h
@@ -35,7 +35,6 @@ struct pcm_feederdesc {
 struct feeder_class {
 	KOBJ_CLASS_FIELDS;
 	struct pcm_feederdesc desc;
-	void *data;
 	SLIST_ENTRY(feeder_class) link;
 };
 
@@ -64,13 +63,12 @@ struct pcm_feeder *feeder_find(struct pcm_channel *c, u_int32_t type);
 void feeder_printchain(struct pcm_feeder *head);
 int feeder_chain(struct pcm_channel *);
 
-#define FEEDER_DECLARE(feeder, type, pdata)				\
+#define FEEDER_DECLARE(feeder, type)					\
 static struct feeder_class feeder ## _class = {				\
 	.name =		#feeder,					\
 	.methods =	feeder ## _methods,				\
 	.size =		sizeof(struct pcm_feeder),			\
 	.desc =		{ type, 0, 0 },					\
-	.data =		pdata,						\
 };									\
 SYSINIT(feeder, SI_SUB_DRIVERS, SI_ORDER_ANY, feeder_register,		\
     &feeder ## _class)
diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c
index 05f5a5b82290..3838328fb0bb 100644
--- a/sys/dev/sound/pcm/feeder_eq.c
+++ b/sys/dev/sound/pcm/feeder_eq.c
@@ -427,7 +427,7 @@ static kobj_method_t feeder_eq_methods[] = {
 	KOBJMETHOD_END
 };
 
-FEEDER_DECLARE(feeder_eq, FEEDER_EQ, NULL);
+FEEDER_DECLARE(feeder_eq, FEEDER_EQ);
 
 static int32_t
 feed_eq_scan_preamp_arg(const char *s)
diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c
index 21b54fcafcd7..d2c4d7618ab4 100644
--- a/sys/dev/sound/pcm/feeder_format.c
+++ b/sys/dev/sound/pcm/feeder_format.c
@@ -180,4 +180,4 @@ static kobj_method_t feeder_format_methods[] = {
 	KOBJMETHOD_END
 };
 
-FEEDER_DECLARE(feeder_format, FEEDER_FORMAT, NULL);
+FEEDER_DECLARE(feeder_format, FEEDER_FORMAT);
diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c
index 69c7e5962268..7319b10930de 100644
--- a/sys/dev/sound/pcm/feeder_matrix.c
+++ b/sys/dev/sound/pcm/feeder_matrix.c
@@ -405,7 +405,7 @@ static kobj_method_t feeder_matrix_methods[] = {
 	KOBJMETHOD_END
 };
 
-FEEDER_DECLARE(feeder_matrix, FEEDER_MATRIX, NULL);
+FEEDER_DECLARE(feeder_matrix, FEEDER_MATRIX);
 
 /* External */
 int
diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c
index 3c2a58ba145f..10de42ba727a 100644
--- a/sys/dev/sound/pcm/feeder_mixer.c
+++ b/sys/dev/sound/pcm/feeder_mixer.c
@@ -366,4 +366,4 @@ static kobj_method_t feeder_mixer_methods[] = {
 	KOBJMETHOD_END
 };
 
-FEEDER_DECLARE(feeder_mixer, FEEDER_MIXER, NULL);
+FEEDER_DECLARE(feeder_mixer, FEEDER_MIXER);
diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c
index 173a0c1fcd39..c2c232a97177 100644
--- a/sys/dev/sound/pcm/feeder_rate.c
+++ b/sys/dev/sound/pcm/feeder_rate.c
@@ -1714,4 +1714,4 @@ static kobj_method_t feeder_rate_methods[] = {
 	KOBJMETHOD_END
 };
 
-FEEDER_DECLARE(feeder_rate, FEEDER_RATE, NULL);
+FEEDER_DECLARE(feeder_rate, FEEDER_RATE);
diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c
index 942f1a273edf..a45003849034 100644
--- a/sys/dev/sound/pcm/feeder_volume.c
+++ b/sys/dev/sound/pcm/feeder_volume.c
@@ -314,7 +314,7 @@ static kobj_method_t feeder_volume_methods[] = {
 	KOBJMETHOD_END
 };
 
-FEEDER_DECLARE(feeder_volume, FEEDER_VOLUME, NULL);
+FEEDER_DECLARE(feeder_volume, FEEDER_VOLUME);
 
 /* Extern */