From nobody Tue Nov 11 12:07:59 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 4d5QKD3RZmz6GKfq; Tue, 11 Nov 2025 12:08: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 4d5QKD1NY1z3bR2; Tue, 11 Nov 2025 12:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762862880; 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=f1W1BdIM2F3uh64oldvgQB4vuNCqL69kTeqMK1L/K44=; b=F8gItfn74Udfvy/FmR8Nc8CTmxv6LUFcYWtU8CWH2tlUCyoJjOhy4AVe/4t/dEcMBdWZek 16KaAFFfj7IQJ0NSVgCc12dg6Pm+Z2OaHskL3Yh/cCWPR6OHUeefg8iaCXCjM4Cz5LAT7S DcZUXermI1Xq5DzxlBV+KV6M7dyjP4795V3Q7jcDNxieFQ6NDXmaFmX4IjG8Ews8oM0x7o LeHNau+lp9C9xmIPShzPxpDtWj8icnxMoc5XbebgMBsvSFHasrbg0SQ7SknpvrpmjC31ET L/b6l7z2ifZ4xpzWftBOw44cyalX745nMieopoZNDvTdmag6ilecD7/M4z1yBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762862880; 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=f1W1BdIM2F3uh64oldvgQB4vuNCqL69kTeqMK1L/K44=; b=RfySmNpclIjG0QiOZvZIkohPyp4YpRNheTgzYMcstVRy5q9OUbFjDhNplVpj10wptoqB+p 1W8/97iG8XBP6hjSra01P6GSi4pzglcY4Rh02ClvcQoJPle62qgF4f4oW1T7oaWo7eX2O0 0MVKG3anYkTA0AyKHMsfulf8xtU5RYDnNA0ZdpBSIkEP4qwu1tHleRZNGt1860MRlheeSj 1QqAwqyp81SB+zUR2rBzbU4WScJuqlCZS3UcGEa0+XSgCHjHzFXYbLo4Fe4e/4v+Uua/rQ 3xV+NlktWy/k+oWOdTUHHzUBo1LxpTcuUh2CnOohYST6YAy8moqCwRaUU4HU4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762862880; a=rsa-sha256; cv=none; b=b2NXmKcWODEeDVdKdymnPzL6r19AzQj5D/1L6kv0TxbB9/eE6/lHwbP6NCAu3/4Qnc/gsZ N9VT6WHaZ0x+vdnFzvjCD8XiYSh25tKW1dTPnEYNHDPG8a/Onbx9tSngck+lzkalQ+EbMT cpV8FE/c5GPRlZTBG7+EmApxzbbJMkFvdErGACUZRjPGUHG0jzQPr0/8oazeDLL0gZJGzd ZuThzH1vA0VgCwfa4MB03u8RZy7xnTZLjZXq8PIMF9o2g+zi0qR5hybBF2KoMV7NRwdvW1 233onYOA3mCzwG1Q14a3Pj+QkRGEB1eLFEWuW00++hEa1IojM8qQ+vzThK2IVw== 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 4d5QKD0SBgz13Lc; Tue, 11 Nov 2025 12:08: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 5ABC7xNv034771; Tue, 11 Nov 2025 12:07:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ABC7x9p034768; Tue, 11 Nov 2025 12:07:59 GMT (envelope-from git) Date: Tue, 11 Nov 2025 12:07:59 GMT Message-Id: <202511111207.5ABC7x9p034768@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: 55540ebc33ad - main - sound: Retire snd_dbuf->dev 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: 55540ebc33ad9a52bc4de121cb598243153981a8 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=55540ebc33ad9a52bc4de121cb598243153981a8 commit 55540ebc33ad9a52bc4de121cb598243153981a8 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:03 +0000 Commit: Christos Margiolis CommitDate: 2025-11-11 12:05:03 +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 --- 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");