From nobody Tue Nov 18 00:51:49 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 4d9Qzn4sqKz6HGwQ; Tue, 18 Nov 2025 00:51:49 +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 4d9Qzn38Fjz3xKK; Tue, 18 Nov 2025 00:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427109; 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=9qe3zySG92RHpPhpsmSHjAQkogsfT/xn2BCpMrrUS/A=; b=mrAJGYGTEJBmxEkZA3CjRFqP+f/+hBIMM2m11Xk2mxaGEcPblOrF7MWUFl/AEYVWWUwFGf csRQ3b3KbEhwun9wW0jXhckX3Gjdy5kAGxKoOHQlXoAlYcPkzyrW0DGG5kU90J7Oft6IhF iAcGrbmSka44gMdXcg2gpUDrhGvHVNHFDlOf9lh5wJMIyA7PZyfyXmph9InRqL56YUZqO6 24y7yICnLVQWC8p+77IOsXYxDCaurFqpFKfLJa5S/dna9L0Wy74Clzyxg4eJdXEPyc5bu0 QNx+Tap+5Ub9ecAxlELiXSHY1mX4U8A9Gp7F3+TLIYS8Wf+ysm417izx6rgzZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427109; 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=9qe3zySG92RHpPhpsmSHjAQkogsfT/xn2BCpMrrUS/A=; b=kpTYql5VfL6KgWlKpx/957c1ZUy4ESZhGs2BGJSmkFNTHhNNbFnSaNxTQxxyEKQsxAmAum tr8Z6QdsjmQ6C1V4shII0ZGbINDcgbqV9yH7HXLGOhTPHopwK0X3keV0wztyXweEDXyQXs 7ZH1Bzldy2MWcPWH/LblV62uOPwbW8K5OPGAIZmXmmiu8ms6lqor7hOoImJ+Utbpsj4Ri9 /Dx3s/pyfS+m4+RhMZf3zJEUBW2mBHCGuwoB6vo+7uaMhJRpUfT8NC78rrAbrREmp1msR/ BeCGWvcF3RAX1EfkjG25dhG42LABEmDvU7yL/UXNCR0M4PG10FpbjihNTYHaJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427109; a=rsa-sha256; cv=none; b=Q4dvOcWlDbM7oqB5dXN7aE2zqlLc5hkpPIwx4pQTvdsJygobdMa9UkUGscnDv/sK5S8T5M A/CtjTY6XvFh2TH1vgKK7x2vp4w5lgMa1s3hiqZTTuangTcH0dQOlHjfNlDAkDBxuImNRr ghWvBOvSSTQmHlj3SyDGgonCm6yVKUg5zfPsVAiYwDu0/VKMVPLSh55Mvs9LT3bArqRZaB WFK+P/w6AGVRJMANKJTFbewcUoZlDpF+UEHz3eABzP7fHK931qgiUDn1LbDLG8HXIQm6u2 U5pUXG03Q83PTOGHHZ4G4h64JHl8mS0qxrdeQtcpgzZgzSFxrzWC64AJW77QRg== 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 4d9Qzn22gDzXmp; Tue, 18 Nov 2025 00:51:49 +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 5AI0pnOF044818; Tue, 18 Nov 2025 00:51:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pnud044815; Tue, 18 Nov 2025 00:51:49 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:49 GMT Message-Id: <202511180051.5AI0pnud044815@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: aabcb5d35b47 - stable/15 - sound: Retire snd_dbuf->dev 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: aabcb5d35b47d0c6fb4ed11a34dde3eec0434779 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=aabcb5d35b47d0c6fb4ed11a34dde3eec0434779 commit aabcb5d35b47d0c6fb4ed11a34dde3eec0434779 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:03 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Retire snd_dbuf->dev Redundant, and if we at some point really need this, we can fetch it from snd_dbuf->channel->dev. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53519 (cherry picked from commit 55540ebc33ad9a52bc4de121cb598243153981a8) --- sys/dev/sound/pcm/buffer.c | 5 ++--- sys/dev/sound/pcm/buffer.h | 3 +-- sys/dev/sound/pcm/channel.c | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index de535ec2dcba..0b77ab599aed 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -41,13 +41,12 @@ #include "snd_fxdiv_gen.h" struct snd_dbuf * -sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *channel) +sndbuf_create(char *drv, char *desc, struct pcm_channel *channel) { struct snd_dbuf *b; b = malloc(sizeof(*b), M_DEVBUF, M_WAITOK | M_ZERO); snprintf(b->name, SNDBUF_NAMELEN, "%s:%s", drv, desc); - b->dev = dev; b->channel = channel; return b; @@ -72,7 +71,7 @@ sndbuf_setmap(void *arg, bus_dma_segment_t *segs, int nseg, int error) struct snd_dbuf *b = (struct snd_dbuf *)arg; if (snd_verbose > 3) { - device_printf(b->dev, "sndbuf_setmap %lx, %lx; ", + printf("sndbuf_setmap %lx, %lx; ", (u_long)segs[0].ds_addr, (u_long)segs[0].ds_len); printf("%p -> %lx\n", b->buf, (u_long)segs[0].ds_addr); } diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index 841bfb85af3c..eaca6d8f313d 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -31,7 +31,6 @@ #define SNDBUF_NAMELEN 48 struct snd_dbuf { - device_t dev; u_int8_t *buf, *tmpbuf; u_int8_t *shadbuf; /**< shadow buffer used w/ S_D_SILENCE/SKIP */ volatile int sl; /**< shadbuf ready length in # of bytes */ @@ -55,7 +54,7 @@ struct snd_dbuf { char name[SNDBUF_NAMELEN]; }; -struct snd_dbuf *sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *channel); +struct snd_dbuf *sndbuf_create(char *drv, char *desc, struct pcm_channel *channel); void sndbuf_destroy(struct snd_dbuf *b); void sndbuf_dump(struct snd_dbuf *b, char *s, u_int32_t what); diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 062eeb251a5b..e7c0779ea2df 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1269,8 +1269,8 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, goto fail; } - b = sndbuf_create(c->dev, c->name, "primary", c); - bs = sndbuf_create(c->dev, c->name, "secondary", c); + b = sndbuf_create(c->name, "primary", c); + bs = sndbuf_create(c->name, "secondary", c); if (b == NULL || bs == NULL) { device_printf(d->dev, "%s(): failed to create %s buffer\n", __func__, b == NULL ? "hardware" : "software");