git: ae879f73a03f - stable/15 - sound: Retire feeder_register_root()

The branch stable/15 has been updated by christos:

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

commit ae879f73a03ff8f0657248e403576640ebf7d134
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2025-11-11 12:06:41 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2025-11-18 00:51:24 +0000

    sound: Retire feeder_register_root()
    
    We can now use feeder_register().
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Reviewed by:    markj
    Differential Revision:  https://reviews.freebsd.org/D53560
    
    (cherry picked from commit 2ba68208390a2c091039eb6731cdc2ebe280f89a)
---
 sys/dev/sound/pcm/feeder.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index e2d05f307f4d..fa4e4e16a133 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -41,27 +41,13 @@
 
 static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder");
 
-static SLIST_HEAD(, feeder_class) feedertab;
-
-static void
-feeder_register_root(void *p)
-{
-	struct feeder_class *fc = p;
-
-	KASSERT(fc->type == FEEDER_ROOT,
-	    ("first feeder not root: %s", fc->name));
-
-	SLIST_INIT(&feedertab);
-	SLIST_INSERT_HEAD(&feedertab, fc, link);
-}
+static SLIST_HEAD(, feeder_class) feedertab = SLIST_HEAD_INITIALIZER(feedertab);
 
 void
 feeder_register(void *p)
 {
 	struct feeder_class *fc = p;
 
-	KASSERT(fc->type != 0, ("feeder '%s' has no descriptor", fc->name));
-
 	SLIST_INSERT_HEAD(&feedertab, fc, link);
 }
 
@@ -381,6 +367,6 @@ static struct feeder_class feeder_root_class = {
  * Register the root feeder first so that pcm_addchan() and subsequent
  * functions can use it.
  */
-SYSINIT(feeder_root, SI_SUB_DRIVERS, SI_ORDER_FIRST, feeder_register_root,
+SYSINIT(feeder_root, SI_SUB_DRIVERS, SI_ORDER_FIRST, feeder_register,
     &feeder_root_class);
 SYSUNINIT(feeder_root, SI_SUB_DRIVERS, SI_ORDER_FIRST, feeder_unregisterall, NULL);