From nobody Tue Nov 11 12:08:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d5QKR5LgCz6GLGq; Tue, 11 Nov 2025 12:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d5QKR2tB9z3bT4; Tue, 11 Nov 2025 12:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762862891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PGAsgz1kfsfpn1P+QpW1MiUprZcl7/vLxtQe0HzDUoc=; b=wBlnEI5YKPYbgwcL5XolGWJP7nSnseqc0ddByXv5RIN4r6YYM6J72FbaBLz1NdShnN0hsq j18IRFYziKGBN0lfg4pNXyG8FEWYslb9hbxCvlqkw3Wbs7HymVS7rs6YyQnRSJFDdjnaeW EcWOQMpelncozJcvzv1ybCvOKCSVusHJSKq8efm/OquJyBIkCnJ6cEk/tgLQ+PmwbwLg1l KOsaLSEYQUkznDd7yaISah8z+/urbd8ImQ3FlBHsspmm5LMEKikBjHImrdTGiI1HV+pxGe MHrVYQN37h8zQuqj9UrOCh9oyWrPj/oQra3hwZHW99fHVAEumVzkwuZXzsdJ/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762862891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PGAsgz1kfsfpn1P+QpW1MiUprZcl7/vLxtQe0HzDUoc=; b=Aiagn1bIBBkDXcfaSXZJwtwcHLejZmF56YAJHntoVSrD0TH2jJJROOx/FrElgQ93RvKPhL nljkfacKW1UzBGIB5BhTFNkpHl1SGO42VcXAuqhVpx6o0D6CWhZRW52yS7uYR1yR1lAFT1 rT69Ylg443ZDTIlVNAYTnCR4sl2CPJF1Q+Tkjy1iZKJe4eDmbuJHhWpJvWkFNVLrgSXkkK Ua+beOs567XoK1g+l6T1+mFmNSD19FSvXhQUXyYgAnsHu9Unywyns7yCRLNweKN3FoM+DP 83kvDTYfpEWKChACuEZF+pq7UEchVq0MlSh1IdvsOLkPAJNjY+bsnS82wn/t3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762862891; a=rsa-sha256; cv=none; b=BWtQmqbQ+i8N3+hmSYbvGo8lB1SmjAPu/n6qlU03dy7RfIChMPYA/oQoNoiKCdEc7Z9q28 GduEguTbPV45LZ8JzrcFzQL4jLbeHfqINBGJhDpF4x9+Bj7OCQad5t0JloBWvJ1XaA+4lu y/EKnvKV5+hys2M8OWeRz5hU+ovxtTzBmnNaIUwdCSNQE+Il7inSJoeNgRvfmIP3M87Nfu rcqTcQSNq5vzmxinNhSePYA2+pWCmFmpJa2Mh74n3n3+y+G41/5PU5kvp0cqQcw+FkTmB1 qx9jZtRmBNAgEKkNDyUH5c4fUJfNzGtRtvNmh+HQK4SuQYpB5Y0K+isWYaCfLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d5QKR2SmHz13Zj; Tue, 11 Nov 2025 12:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5ABC8BMY035139; Tue, 11 Nov 2025 12:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ABC8BpS035136; Tue, 11 Nov 2025 12:08:11 GMT (envelope-from git) Date: Tue, 11 Nov 2025 12:08:11 GMT Message-Id: <202511111208.5ABC8BpS035136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 84282785cc49 - main - sound: Retire MAXFEEDERS and feedercnt List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84282785cc497c3fb798502899f880e15d063233 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=84282785cc497c3fb798502899f880e15d063233 commit 84282785cc497c3fb798502899f880e15d063233 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:47 +0000 Commit: Christos Margiolis 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