git: 84282785cc49 - main - sound: Retire MAXFEEDERS and feedercnt
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 11 Nov 2025 12:08:11 UTC
The branch main has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=84282785cc497c3fb798502899f880e15d063233
commit 84282785cc497c3fb798502899f880e15d063233
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2025-11-11 12:05:47 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2025-11-11 12:05:47 +0000
sound: Retire MAXFEEDERS and feedercnt
Apart from the fact that it's unrealistic to reach MAXFEEDERS (256),
since sound(4) comes with maximum 7 feeders (including feeder_root),
there is also no reason to cap it.
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D53549
---
sys/dev/sound/pcm/feeder.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 3f6b35c9197d..2e19577bfde3 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -42,15 +42,12 @@
static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder");
-#define MAXFEEDERS 256
-
struct feedertab_entry {
SLIST_ENTRY(feedertab_entry) link;
struct feeder_class *feederclass;
struct pcm_feederdesc *desc;
};
static SLIST_HEAD(, feedertab_entry) feedertab;
-static int feedercnt = 0;
/*****************************************************************************/
@@ -60,7 +57,6 @@ feeder_register_root(void *p)
struct feeder_class *fc = p;
struct feedertab_entry *fte;
- MPASS(feedercnt == 0);
KASSERT(fc->desc == NULL, ("first feeder not root: %s", fc->name));
SLIST_INIT(&feedertab);
@@ -68,7 +64,6 @@ feeder_register_root(void *p)
fte->feederclass = fc;
fte->desc = NULL;
SLIST_INSERT_HEAD(&feedertab, fte, link);
- feedercnt++;
}
void
@@ -85,18 +80,13 @@ feeder_register(void *p)
* translations being unavailable
*/
i = 0;
- while ((feedercnt < MAXFEEDERS) && (fc->desc[i].type > 0)) {
+ while (fc->desc[i].type > 0) {
fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO);
fte->feederclass = fc;
fte->desc = &fc->desc[i];
SLIST_INSERT_HEAD(&feedertab, fte, link);
i++;
}
- feedercnt++;
- if (feedercnt >= MAXFEEDERS) {
- printf("MAXFEEDERS (%d >= %d) exceeded\n",
- feedercnt, MAXFEEDERS);
- }
}
static void