aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristos Margiolis <christos@FreeBSD.org>2025-11-11 12:05:47 +0000
committerChristos Margiolis <christos@FreeBSD.org>2025-11-11 12:05:47 +0000
commit84282785cc497c3fb798502899f880e15d063233 (patch)
tree9a637f1f529463356426f8a69dc10781c81e4751
parentf1157508b37d66c0e038b2a3346858999bcd5984 (diff)
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
-rw-r--r--sys/dev/sound/pcm/feeder.c12
1 files changed, 1 insertions, 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