From nobody Tue Nov 18 00:51:59 2025 X-Original-To: dev-commits-src-branches@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 4d9Qzz62Dmz6HH6D; Tue, 18 Nov 2025 00:51:59 +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 4d9Qzz3fbZz3xWj; Tue, 18 Nov 2025 00:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427119; 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=6T0PlKS1y8fZe0wgpgK0RoR9tY59DbWx/uwmA5r+nq0=; b=WgkjsPvCTUMH+inxR7pFuuu7nL9JjNVEpTtgJYqxuIZ4jk7gMnjCbqb7a8j9nz+bX/XziG XVmX5skQcB8izpD8jMcQRTADYckDDyPwzCfyXLRz/wBZwppShq1iAceQXfuZwnhSfvqFmZ WwBufxS+nv7T/zDpYa89rG0yq/DAsKbPyqU69eyLrAt08JrF4BfbzRVRsWx5538yTQG2tt KM5OzEICnt+2P3fIsg54pyFlvyfqiOKDXicv7PlbdFN3NZv61KwUCwh2haaxhFUyj0cr2o xOCQ8elCUh+hcSkyU3NSAVGLcj5JF7+QHX2PouLo6GETCYh9B05wIaD78aapwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427119; 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=6T0PlKS1y8fZe0wgpgK0RoR9tY59DbWx/uwmA5r+nq0=; b=Q2JAw8mHNzRRLHWxzZeEaRH3p8rw5AVvkuq1xJ/xhWoRscR65k6gMTe102pT5Q8XqLeA9d ICefcg6hjOsu5OuVNcbUI0tuajvVZIPykHhCI107qenarOnwyP/EIx9N41x2Ra/U/yEeNO 1t+MojnIa8pAaxmrXUVYzfhPX9x0p7S59Q3Uk8vxt2/QFxB/bYusC8EPUV4fQmCOrXCBro GPkTNttayl4C3puJ3zVrC73MSMaf86gq22TWBx+3/0qEiFMkQHCBPunLTNzfkOuXq2pZs3 WYe9Fuu5NjyRYvK7s0WpsxMlSdPKja5eP+9Ps6jAltx2mIbsJWWI0yD983BRIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427119; a=rsa-sha256; cv=none; b=GZHXprb7/AXqQbykcCrnwWcK3Xve8mOZU4gdu+nlyiQG0IbVgqdJknix+RaAh0772Fu90M Qr+UCktNHZOeh5nnr2RFG7/WlWNyu+eUGoTO3IgGWoxRIYQrAq9syrVoNnplSVCEVg+nkF 6BC0kXnbTd2Sh6tIGYbw9TqgZNsVMm8kZ0KnA/BK/Ln2oYKSgW4n3t8mTJTvAyRvVENyT3 PrtPofc9jHhyfsfUdl18eBqGcVxc2hlFvE1jWCq38eD0dKn6qW6cm4IKvXnKPOqqUHk/sL qT7VZlSDfmMvNJ40C2KkBbu8y/u3B4JMvWaQgeuAG+XPFFhQOY5HdXhs8DPQbg== 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 4d9Qzz387NzXdQ; Tue, 18 Nov 2025 00:51:59 +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 5AI0pxOD045155; Tue, 18 Nov 2025 00:51:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pxD3045151; Tue, 18 Nov 2025 00:51:59 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:59 GMT Message-Id: <202511180051.5AI0pxD3045151@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: 0c61ba36895a - stable/15 - sound: Retire unused {pcm_feederdesc,feedertab_entry}->idx List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 0c61ba36895aed8cc9eca50b549948235b4d5b21 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0c61ba36895aed8cc9eca50b549948235b4d5b21 commit 0c61ba36895aed8cc9eca50b549948235b4d5b21 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:42 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Retire unused {pcm_feederdesc,feedertab_entry}->idx Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53547 (cherry picked from commit f1157508b37d66c0e038b2a3346858999bcd5984) --- sys/dev/sound/pcm/feeder.c | 8 +------- sys/dev/sound/pcm/feeder.h | 1 - sys/dev/sound/pcm/feeder_eq.c | 4 ++-- sys/dev/sound/pcm/feeder_format.c | 4 ++-- sys/dev/sound/pcm/feeder_matrix.c | 4 ++-- sys/dev/sound/pcm/feeder_mixer.c | 4 ++-- sys/dev/sound/pcm/feeder_rate.c | 4 ++-- sys/dev/sound/pcm/feeder_volume.c | 4 ++-- 8 files changed, 13 insertions(+), 20 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 2ec0ee6fb3fd..3f6b35c9197d 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -48,8 +48,6 @@ struct feedertab_entry { SLIST_ENTRY(feedertab_entry) link; struct feeder_class *feederclass; struct pcm_feederdesc *desc; - - int idx; }; static SLIST_HEAD(, feedertab_entry) feedertab; static int feedercnt = 0; @@ -69,7 +67,6 @@ feeder_register_root(void *p) fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); fte->feederclass = fc; fte->desc = NULL; - fte->idx = feedercnt; SLIST_INSERT_HEAD(&feedertab, fte, link); feedercnt++; } @@ -92,8 +89,6 @@ feeder_register(void *p) fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); fte->feederclass = fc; fte->desc = &fc->desc[i]; - fte->idx = feedercnt; - fte->desc->idx = feedercnt; SLIST_INSERT_HEAD(&feedertab, fte, link); i++; } @@ -156,7 +151,6 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) f->desc->in = 0; f->desc->out = 0; f->desc->flags = 0; - f->desc->idx = 0; } err = FEEDER_INIT(f); @@ -394,7 +388,7 @@ feeder_printchain(struct pcm_feeder *head) printf("feeder chain (head @%p)\n", head); f = head; while (f != NULL) { - printf("%s/%d @ %p\n", f->class->name, f->desc->idx, f); + printf("%s @ %p\n", f->class->name, f); f = f->source; } printf("[end]\n\n"); diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index 60b8280e59ef..e417d68fea71 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -31,7 +31,6 @@ struct pcm_feederdesc { u_int32_t type; u_int32_t in, out; u_int32_t flags; - int idx; }; struct feeder_class { diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 23e27b922486..88a083a3bfd1 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -420,8 +420,8 @@ feed_eq_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_eq_desc[] = { - { FEEDER_EQ, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_EQ, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_eq_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 0feac43374b8..c9679cfeba44 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -173,8 +173,8 @@ feed_format_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_format_desc[] = { - { FEEDER_FORMAT, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_FORMAT, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_format_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 43258a311d82..a0af32b887ce 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -399,8 +399,8 @@ feed_matrix_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_matrix_desc[] = { - { FEEDER_MATRIX, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_MATRIX, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_matrix_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index ab67a14711d3..028e9366aa8e 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -359,8 +359,8 @@ feed_mixer_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_mixer_desc[] = { - { FEEDER_MIXER, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_MIXER, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_mixer_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 9c29142b9d6b..166165e95e65 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -1706,8 +1706,8 @@ z_resampler_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_rate_desc[] = { - { FEEDER_RATE, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 }, + { FEEDER_RATE, 0, 0, 0 }, + { 0, 0, 0, 0 }, }; static kobj_method_t feeder_rate_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index ddcbf29804f3..119ab1b288d8 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -307,8 +307,8 @@ feed_volume_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_volume_desc[] = { - { FEEDER_VOLUME, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_VOLUME, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_volume_methods[] = {