From nobody Tue Nov 11 12:08:17 2025 X-Original-To: dev-commits-src-main@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 4d5QKZ38Dwz6GLNM; Tue, 11 Nov 2025 12:08:18 +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 4d5QKY6gvrz3byt; Tue, 11 Nov 2025 12:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762862897; 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=x3J48MFEqr5dImUGSsVk6E2Tz+jbJW2f/Fh/uIWwmog=; b=R4tSm6Xwj8kP9okf8cEgsg4YNSLHzwFUVS+Dt1OgAUUIsvuwCF7nrE3xOtkBtin4abJQ7l a03gZe3Sf/eoGcx3cgUErjG14gGdJ8IbtqNYWxWdFbbesG+y5kGpu2qiuIYK+vIS84h4SP EyfW5Q25/tFhyhGyzGZNqQ/h47mlBV11GLsCJ/lpBVsLnKlg1D7K50TmUnKxgHkASDZ8Lz opHakx5ldoWkcukqwS39ee1rRHVzxSMs4ereQwWOVe+fz27noZShG6YQTa4Zn1Y8Mh+rLw Ypzfl1lFUm9gJ/gvjtkzTS2wqKwtHSgKq4Ysvzybth9bgdXS7eVXFClT87+t3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762862897; 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=x3J48MFEqr5dImUGSsVk6E2Tz+jbJW2f/Fh/uIWwmog=; b=o0eiZNv3DSUzH6UOo4aza1i+kUgbhArN/4U3iHAPDymPoGoE7ZsP9INN6AxQIAusibmiU6 2oikyaB129WWS72ICgoNztV+izQIOoiwe+RbnvZhHd1+13eKx02IldFU1yupk9POCBdDSQ rbUXcL1TpHAdef5KBhNW2v8rXM235PjLE3mYMbfRWyOYwn6c8rswbEkvbw4HsyCEaLxn0G OND4lxslxPopy+ixDAYKnQB/gEn5R+hEffTaWCludzScaigAP4g715fmqsGz9Yy2boZcWp mHW9/ZXR5vshIAjdSbtSmnzX87Avq5vp+PQzn6c+0O3yATJFt5jFO+o1TULqPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762862897; a=rsa-sha256; cv=none; b=ebTfJIIyCPGfqDSVpBXC4nuEpH3EXGph7eznNkEVTORsLQXVkMx0YP8S+84pZ2n7n9NQX7 1baNAbQPINP3FfpZttF3yjVMNFS134SOtKzp29X5k1LsCd9/5iRYXZDtLzdocUy8qlOEDz 5vly+Meya3EDn3fuUdZSrjbWg5Ry6MvQnu15kRt0jng5otwzQTKkZ7/+vln3CSt6XqoRHZ Ibmsu6gfq37dk7nynLw0xpy5tWXOq7lbFHwtb/8pbzD1O5i14h5vI267v19KsUN9RktTLb uZD0okug2ci7smQwB0d+NfMVD0JRh9EKLuWNEnjnqwUPQ4aZq00mm+63CdPhRA== 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 4d5QKY6G31z13pT; Tue, 11 Nov 2025 12:08:17 +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 5ABC8H6K035344; Tue, 11 Nov 2025 12:08:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ABC8HKl035341; Tue, 11 Nov 2025 12:08:17 GMT (envelope-from git) Date: Tue, 11 Nov 2025 12:08:17 GMT Message-Id: <202511111208.5ABC8HKl035341@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: 762f8e6f515a - main - sound: Retire feeder_class->data List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 762f8e6f515a33274503872cf597e0895ff706bc Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=762f8e6f515a33274503872cf597e0895ff706bc commit 762f8e6f515a33274503872cf597e0895ff706bc Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:18 +0000 Commit: Christos Margiolis CommitDate: 2025-11-11 12:06:18 +0000 sound: Retire feeder_class->data It's always NULL. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53555 --- sys/dev/sound/pcm/feeder.c | 3 +-- sys/dev/sound/pcm/feeder.h | 4 +--- sys/dev/sound/pcm/feeder_eq.c | 2 +- sys/dev/sound/pcm/feeder_format.c | 2 +- sys/dev/sound/pcm/feeder_matrix.c | 2 +- sys/dev/sound/pcm/feeder_mixer.c | 2 +- sys/dev/sound/pcm/feeder_rate.c | 2 +- sys/dev/sound/pcm/feeder_volume.c | 2 +- 8 files changed, 8 insertions(+), 11 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 6f7b225af3b9..f55c3e5992e1 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -88,7 +88,7 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) if (f == NULL) return NULL; - f->data = fc->data; + f->data = NULL; f->source = NULL; f->parent = NULL; f->class = fc; @@ -401,7 +401,6 @@ static struct feeder_class feeder_root_class = { .methods = feeder_root_methods, .size = sizeof(struct pcm_feeder), .desc = { FEEDER_ROOT, 0, 0 }, - .data = NULL, }; /* * Register the root feeder first so that pcm_addchan() and subsequent diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index 5ac92bf13735..f89652ab9635 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -35,7 +35,6 @@ struct pcm_feederdesc { struct feeder_class { KOBJ_CLASS_FIELDS; struct pcm_feederdesc desc; - void *data; SLIST_ENTRY(feeder_class) link; }; @@ -64,13 +63,12 @@ struct pcm_feeder *feeder_find(struct pcm_channel *c, u_int32_t type); void feeder_printchain(struct pcm_feeder *head); int feeder_chain(struct pcm_channel *); -#define FEEDER_DECLARE(feeder, type, pdata) \ +#define FEEDER_DECLARE(feeder, type) \ static struct feeder_class feeder ## _class = { \ .name = #feeder, \ .methods = feeder ## _methods, \ .size = sizeof(struct pcm_feeder), \ .desc = { type, 0, 0 }, \ - .data = pdata, \ }; \ SYSINIT(feeder, SI_SUB_DRIVERS, SI_ORDER_ANY, feeder_register, \ &feeder ## _class) diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 05f5a5b82290..3838328fb0bb 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -427,7 +427,7 @@ static kobj_method_t feeder_eq_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_eq, FEEDER_EQ, NULL); +FEEDER_DECLARE(feeder_eq, FEEDER_EQ); static int32_t feed_eq_scan_preamp_arg(const char *s) diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 21b54fcafcd7..d2c4d7618ab4 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -180,4 +180,4 @@ static kobj_method_t feeder_format_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_format, FEEDER_FORMAT, NULL); +FEEDER_DECLARE(feeder_format, FEEDER_FORMAT); diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 69c7e5962268..7319b10930de 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -405,7 +405,7 @@ static kobj_method_t feeder_matrix_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_matrix, FEEDER_MATRIX, NULL); +FEEDER_DECLARE(feeder_matrix, FEEDER_MATRIX); /* External */ int diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 3c2a58ba145f..10de42ba727a 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -366,4 +366,4 @@ static kobj_method_t feeder_mixer_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_mixer, FEEDER_MIXER, NULL); +FEEDER_DECLARE(feeder_mixer, FEEDER_MIXER); diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 173a0c1fcd39..c2c232a97177 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -1714,4 +1714,4 @@ static kobj_method_t feeder_rate_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_rate, FEEDER_RATE, NULL); +FEEDER_DECLARE(feeder_rate, FEEDER_RATE); diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index 942f1a273edf..a45003849034 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -314,7 +314,7 @@ static kobj_method_t feeder_volume_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_volume, FEEDER_VOLUME, NULL); +FEEDER_DECLARE(feeder_volume, FEEDER_VOLUME); /* Extern */