From nobody Tue Nov 18 00:52:00 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 4d9R0068srz6HGtH; Tue, 18 Nov 2025 00:52:00 +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 4d9R004nFdz3xpK; Tue, 18 Nov 2025 00:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427120; 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=c0R0TRzPvcCSQyc3ECdhKxkIszmZz9xaV2JcyAEFGnc=; b=eJnIpxyCIkzfm6mEx79VmUYckgH9AzPNAnCit48KvayYK3sM9lcmjUhoLTfcn+XqVHSI9H DAkzmc+/s4ijrE+8wo0xcOe7WJD9gixSPY/jfn9hw/1Dyu+vw8bSX8LtbWUgyo5KyaSp18 xcRhhy3BQjgSdRTLC8ImK3CI2gZKAX0BZfuwg93sAuAwyDXjbYg9nb85jrW2auJVSHiMlb Df/D/Mfm6Qd21hJnLmJixXT7DJ0XOgy4KpMVshQ6InUs57NwLdKQks5l5j4GHeQRKuDt8Z rmuRqUrub9/8TLoDJvjLDyTvV4PlYdbxTE0ookTFpXriOmfyNdUOz8/4wI/Clg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427120; 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=c0R0TRzPvcCSQyc3ECdhKxkIszmZz9xaV2JcyAEFGnc=; b=q8e9v2fbt4Tx+WpNrFqwe6EZjyRVJSi+uOLEPy7NIVQqwCtnwb6h8xetZY0heAvdKE3Bdb l4L9iWNTxzdRyyH8nZ/GsH7uYTp7c4K7Irh7cb9e8SmYCgAtoyKVUB9QwMahbVS24XxkT3 q8u7SqOxMGEtrbn9+zxO2ZPF8zRhIwvjCH1amITmHqcBaa5K3yxyYirYGb5CXuitxf88bn +kAwoUfA/E8o+e8PmAHgdKCyvJKSFiy+wmaNvxk9nzyCpw/jDFoXyN7RUZpxv85Qpqn3iG rO2aVqJrR4vh6YGsHbNiO22b0cr8DdB36bl2A6Ml812OhB3dlaYB21xb711LWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427120; a=rsa-sha256; cv=none; b=XnRiNd4LoxnotZlLowbQSDP0dFYkD218qFT2W3NW09z6RmIlSzykBOH0G9F9dTVWbO1wVr ZKxqMS+1XRg41Pup8LOlQKkt+tTBJvSrRLkt9OTPB/Wlb7iI6qLegduc6k71KX0JbJNabi r56aeVUc2LbVXxXxEjjGHBoH1pHcx8V5o4EX2ja3uppo0sYIdQP8Yda5ErydWu2B2Tk3Bn nBJXl4mODx/lGBHPKjszUGgUgRDzeJthfWXg7/m/203w62PlAC9q2fHzVjL1PNMs+g7EwG 2naGwM72jOn+Maydoflco3NWUgBEQYQf1Af2aaVdXnZx1HsQdMFOnojgwZNrvA== 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 4d9R004NltzXdV; Tue, 18 Nov 2025 00:52:00 +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 5AI0q0ST045195; Tue, 18 Nov 2025 00:52:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q0W7045192; Tue, 18 Nov 2025 00:52:00 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:00 GMT Message-Id: <202511180052.5AI0q0W7045192@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ebe59a72abf7 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: ebe59a72abf7c71e0ef5091e91ecd36e6771422c Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ebe59a72abf7c71e0ef5091e91ecd36e6771422c commit ebe59a72abf7c71e0ef5091e91ecd36e6771422c Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:47 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +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 (cherry picked from commit 84282785cc497c3fb798502899f880e15d063233) --- 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