git: 5dd90538ba4d - stable/15 - sound: Simplify feeder_getclass()

The branch stable/15 has been updated by christos:

URL: https://cgit.FreeBSD.org/src/commit/?id=5dd90538ba4d13e0fe6633568412dfa11966fa39

commit 5dd90538ba4d13e0fe6633568412dfa11966fa39
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2025-11-11 12:06:09 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2025-11-18 00:51:23 +0000

    sound: Simplify feeder_getclass()
    
    With the parameters we provide feeder_getclass(), the only thing we
    really care about is the feeder's class type. We can simplify (and make
    the code more readable) that by simply passing the type to
    feeder_getclass(). Apart from being simpler, we can now also retire
    feedertab_entry->desc and cmpdesc().
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Reviewed by:    markj
    Differential Revision:  https://reviews.freebsd.org/D53553
    
    (cherry picked from commit 441a411853e48719d4aa6a36bba0a4c4cbca3a4f)
---
 sys/dev/sound/pcm/channel.c      |  2 +-
 sys/dev/sound/pcm/feeder.c       | 26 +++++++-------------------
 sys/dev/sound/pcm/feeder.h       |  2 +-
 sys/dev/sound/pcm/feeder_chain.c | 14 +++++++-------
 4 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index fda4cd2314a6..f29a819ce0ae 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -1257,7 +1257,7 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls,
 	chn_vpc_reset(c, SND_VOL_C_PCM, 1);
 	CHN_UNLOCK(c);
 
-	fc = feeder_getclass(NULL);
+	fc = feeder_getclass(FEEDER_ROOT);
 	if (fc == NULL) {
 		device_printf(d->dev, "%s(): failed to get feeder class\n",
 		    __func__);
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 6b7c7f43903c..e818ed4a1a5d 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -44,7 +44,6 @@ static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder");
 struct feedertab_entry {
 	SLIST_ENTRY(feedertab_entry) link;
 	struct feeder_class *feederclass;
-	struct pcm_feederdesc *desc;
 };
 static SLIST_HEAD(, feedertab_entry) feedertab;
 
@@ -56,12 +55,12 @@ feeder_register_root(void *p)
 	struct feeder_class *fc = p;
 	struct feedertab_entry *fte;
 
-	KASSERT(fc->desc == NULL, ("first feeder not root: %s", fc->name));
+	KASSERT(fc->desc.type == FEEDER_ROOT,
+	    ("first feeder not root: %s", fc->name));
 
 	SLIST_INIT(&feedertab);
 	fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO);
 	fte->feederclass = fc;
-	fte->desc = NULL;
 	SLIST_INSERT_HEAD(&feedertab, fte, link);
 }
 
@@ -75,7 +74,6 @@ feeder_register(void *p)
 
 	fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO);
 	fte->feederclass = fc;
-	fte->desc = &fc->desc;
 	SLIST_INSERT_HEAD(&feedertab, fte, link);
 }
 
@@ -92,14 +90,6 @@ feeder_unregisterall(void *p)
 	}
 }
 
-static int
-cmpdesc(struct pcm_feederdesc *n, struct pcm_feederdesc *m)
-{
-	return ((n->type == m->type) &&
-		((n->in == 0) || (n->in == m->in)) &&
-		((n->out == 0) || (n->out == m->out)));
-}
-
 static void
 feeder_destroy(struct pcm_feeder *f)
 {
@@ -143,17 +133,15 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc)
 }
 
 struct feeder_class *
-feeder_getclass(struct pcm_feederdesc *desc)
+feeder_getclass(u_int32_t type)
 {
 	struct feedertab_entry *fte;
 
 	SLIST_FOREACH(fte, &feedertab, link) {
-		if ((desc == NULL) && (fte->desc == NULL))
-			return fte->feederclass;
-		if ((fte->desc != NULL) && (desc != NULL) && cmpdesc(desc, fte->desc))
-			return fte->feederclass;
+		if (fte->feederclass->desc.type == type)
+			return (fte->feederclass);
 	}
-	return NULL;
+	return (NULL);
 }
 
 int
@@ -431,7 +419,7 @@ static struct feeder_class feeder_root_class = {
 	.name =		"feeder_root",
 	.methods =	feeder_root_methods,
 	.size =		sizeof(struct pcm_feeder),
-	.desc =		{ 0 },
+	.desc =		{ FEEDER_ROOT, 0, 0 },
 	.data =		NULL,
 };
 /*
diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h
index 86cabb3e9925..e883083f7504 100644
--- a/sys/dev/sound/pcm/feeder.h
+++ b/sys/dev/sound/pcm/feeder.h
@@ -49,7 +49,7 @@ struct pcm_feeder {
 };
 
 void feeder_register(void *p);
-struct feeder_class *feeder_getclass(struct pcm_feederdesc *desc);
+struct feeder_class *feeder_getclass(u_int32_t type);
 
 u_int32_t snd_fmtscore(u_int32_t fmt);
 u_int32_t snd_fmtbestbit(u_int32_t fmt, u_int32_t *fmts);
diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c
index f5075bf76a49..6d896364e3ca 100644
--- a/sys/dev/sound/pcm/feeder_chain.c
+++ b/sys/dev/sound/pcm/feeder_chain.c
@@ -148,7 +148,7 @@ feeder_build_format(struct pcm_channel *c, struct feeder_chain_desc *cdesc)
 	desc->in = 0;
 	desc->out = 0;
 
-	fc = feeder_getclass(desc);
+	fc = feeder_getclass(FEEDER_FORMAT);
 	if (fc == NULL) {
 		device_printf(c->dev,
 		    "%s(): can't find feeder_format\n", __func__);
@@ -220,7 +220,7 @@ feeder_build_rate(struct pcm_channel *c, struct feeder_chain_desc *cdesc)
 	desc->in = 0;
 	desc->out = 0;
 
-	fc = feeder_getclass(desc);
+	fc = feeder_getclass(FEEDER_RATE);
 	if (fc == NULL) {
 		device_printf(c->dev,
 		    "%s(): can't find feeder_rate\n", __func__);
@@ -297,7 +297,7 @@ feeder_build_matrix(struct pcm_channel *c, struct feeder_chain_desc *cdesc)
 	desc->in = 0;
 	desc->out = 0;
 
-	fc = feeder_getclass(desc);
+	fc = feeder_getclass(FEEDER_MATRIX);
 	if (fc == NULL) {
 		device_printf(c->dev,
 		    "%s(): can't find feeder_matrix\n", __func__);
@@ -353,7 +353,7 @@ feeder_build_volume(struct pcm_channel *c, struct feeder_chain_desc *cdesc)
 	desc->in = 0;
 	desc->out = 0;
 
-	fc = feeder_getclass(desc);
+	fc = feeder_getclass(FEEDER_VOLUME);
 	if (fc == NULL) {
 		device_printf(c->dev,
 		    "%s(): can't find feeder_volume\n", __func__);
@@ -420,7 +420,7 @@ feeder_build_eq(struct pcm_channel *c, struct feeder_chain_desc *cdesc)
 	desc->in = 0;
 	desc->out = 0;
 
-	fc = feeder_getclass(desc);
+	fc = feeder_getclass(FEEDER_EQ);
 	if (fc == NULL) {
 		device_printf(c->dev,
 		    "%s(): can't find feeder_eq\n", __func__);
@@ -462,7 +462,7 @@ feeder_build_root(struct pcm_channel *c, struct feeder_chain_desc *cdesc)
 	struct feeder_class *fc;
 	int ret;
 
-	fc = feeder_getclass(NULL);
+	fc = feeder_getclass(FEEDER_ROOT);
 	if (fc == NULL) {
 		device_printf(c->dev,
 		    "%s(): can't find feeder_root\n", __func__);
@@ -499,7 +499,7 @@ feeder_build_mixer(struct pcm_channel *c, struct feeder_chain_desc *cdesc)
 	desc->in = 0;
 	desc->out = 0;
 
-	fc = feeder_getclass(desc);
+	fc = feeder_getclass(FEEDER_MIXER);
 	if (fc == NULL) {
 		device_printf(c->dev,
 		    "%s(): can't find feeder_mixer\n", __func__);