From nobody Tue Nov 18 00:51:50 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 4d9Qzq04xZz6HGwT; Tue, 18 Nov 2025 00:51:51 +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 4d9Qzp40Bdz3xVM; Tue, 18 Nov 2025 00:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427110; 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=YdmatD7/pcibVtBWM79hyD/IjMcWhoe9D+rxF5Z/S24=; b=lAUeu3DruJwDieSQWQDXvP3gbRP8K7j/qxUFg8dGu9ohKKrUh7yCR6sBkX6iX9hgrL+t8G yH9FA92QAarAlB/JuPUA8WD3egE8nE2iLzEz00qyJr1fBpeurc0Xg+vHsKAAqc+G6fDiyj W2R0L4j1DC+06/9lQVA5NGGDq8ldEHZ3AcK519wox8e1gisTQJG67ntC312L18Mzviiqe1 HfWYvVdPfIOq43pM0Dk2Oc4euJ2hq+ygTYSbcNrpdThTJ6JFuWLSqsJzu+6WN+rD29uGvy QajoNCOOCd2fBEnRb5nKliE1FLUd7mUVDDEaW19vrUdO6ILyYoVXTruDguobSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427110; 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=YdmatD7/pcibVtBWM79hyD/IjMcWhoe9D+rxF5Z/S24=; b=sbi24J0f/WaPYLQm0MEEB0RoRS41JPYqZ1m7opvjpPhq+itLsxIZKPdRHuAu/7GvAWrkux n8dTO0bqBx0qlhvg9WcgA3so0NPhACYHD9ooMMAtL4obEhW+ZU6FYeHqWta+1pH/Zka2cE 3sEmStOH8wUpFiHW17Mst5pad/mXyCSYjNnCTETyYASXeEAh+H+KU6X372p5/ToPHUOJVv FOC9PeBLqu5aCrvb+hl33eD6fVnzLdgDZHVXuLtlT6uar8mglrTAozJVvxexmPrsby+AUA gkP82YtOMCwy/9MYK7P02fYv2VfRhL5+AC+Q/d/Qt33paMxtK16Ai9pt/4djAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427110; a=rsa-sha256; cv=none; b=ezCDVUT9KKws92SjwGPJGQ+TaeH+gXlxxBVnuERRziYUHQbFJjX2/0aCZ6Nf3OCKZK+BUY 9IudM4Ayv8gD8mILMelhiPfaduNWNVnJTa356OiihQpUOFI7aP9cIjf0Bznshe9Mz/WU1Z Wy4/jiDTxlVIoel4XV0g/VNvawJdJWPbufCvKKyn7n81MGo1Glw4j7jH67ZfnIA5FuabJS xC21Q1WKHZ2xFSmVE9SkljzSRREBBpWeg3M6wAFBFWsWo75Bjomj2LSXeZ/i8zQSYRkwWu FHXyT+YynNz2aSbqKQapjlBiIwwgi7W2yxuKd4s4S4jvpnIVj6R/dCYNFnfoDA== 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 4d9Qzp3JzlzXdK; Tue, 18 Nov 2025 00:51:50 +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 5AI0poag044855; Tue, 18 Nov 2025 00:51:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0poJg044852; Tue, 18 Nov 2025 00:51:50 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:50 GMT Message-Id: <202511180051.5AI0poJg044852@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: 155f24992674 - stable/15 - sound: Re-arrange sndbuf_create() arguments 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: 155f24992674be5d04c7606c81b113fcec456a73 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=155f24992674be5d04c7606c81b113fcec456a73 commit 155f24992674be5d04c7606c81b113fcec456a73 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:07 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Re-arrange sndbuf_create() arguments Since we always use the channel name as the "drv" argument, we can just get rid of it and fetch it in sndbuf_create(). Also, put the "channel" argument first, as it is more intuitive. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53520 (cherry picked from commit 482d0d97885506a5eb2b1f2501f65e7e4fca6fdc) --- sys/dev/sound/pcm/buffer.c | 4 ++-- sys/dev/sound/pcm/buffer.h | 2 +- sys/dev/sound/pcm/channel.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index 0b77ab599aed..b162da97f9e2 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -41,12 +41,12 @@ #include "snd_fxdiv_gen.h" struct snd_dbuf * -sndbuf_create(char *drv, char *desc, struct pcm_channel *channel) +sndbuf_create(struct pcm_channel *channel, const char *desc) { struct snd_dbuf *b; b = malloc(sizeof(*b), M_DEVBUF, M_WAITOK | M_ZERO); - snprintf(b->name, SNDBUF_NAMELEN, "%s:%s", drv, desc); + snprintf(b->name, SNDBUF_NAMELEN, "%s:%s", channel->name, desc); b->channel = channel; return b; diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index eaca6d8f313d..329a41d0b0a5 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -54,7 +54,7 @@ struct snd_dbuf { char name[SNDBUF_NAMELEN]; }; -struct snd_dbuf *sndbuf_create(char *drv, char *desc, struct pcm_channel *channel); +struct snd_dbuf *sndbuf_create(struct pcm_channel *channel, const char *desc); 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 e7c0779ea2df..749ee4d9cdba 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->name, "primary", c); - bs = sndbuf_create(c->name, "secondary", c); + b = sndbuf_create(c, "primary"); + bs = sndbuf_create(c, "secondary"); if (b == NULL || bs == NULL) { device_printf(d->dev, "%s(): failed to create %s buffer\n", __func__, b == NULL ? "hardware" : "software");