From nobody Tue Nov 11 12:08:01 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 4d5QKF3gvzz6GL9v; Tue, 11 Nov 2025 12:08:01 +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 4d5QKF1QTcz3bCy; Tue, 11 Nov 2025 12:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762862881; 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=0FEn/DHgHxeVEzh1JeMkkrFB3e6ZaK0+2gzvAITF/Ds=; b=JsLd+BVftDOqexgJC+806mLQEozQ7OU9vnD+JPLoa7yxePN7cyCye25WwPhaV2L0CK7jjw 8wJ6CZ3ByhzaD2FIK3enpfn/xPJomgmG+YXEtssDzDykpC33BE8FsFyadCqICrIxjCPn9D OMN7j3NlH85d3QcWpmYv6BTLsOV7AkT63N4lOhru55vmsgn4U0jSI/QHuwt6nh6k45HFV3 c/vK0hzqfDJ8ZOcZoQHixlxeYaP6AoxidAMwXB1+f9jilMJ3wlRrlqoR/HFpszwNioiMkD g5Q3vpu6eWQospVR57Y0mOjQe8WmKA47S+WoGsLJND5XdD2fQl9CpvjIr+vg+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762862881; 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=0FEn/DHgHxeVEzh1JeMkkrFB3e6ZaK0+2gzvAITF/Ds=; b=J41HvxO9Zh4vh8M5WzUoxPMchqsGsrYRd+mK1RvCORxXu6RoUM3SO2GsjkzaqTD7ycCBlu mVep4Nl5gdAkTCQQlcwUUgJrSOpe8qF5fH+R0Kb7MoqK7sFFEhGIskWp3WqdgJjpMOZnM6 RDwCwOaB6yZuTezNaUeGf+mbf9EocprUQb8t4hYlBwsrONacYZIyYtrgBvXLADCqVT/VJZ HRCLtddW/Z5nj2uFqpU9igXhOIoPf3NJJi01BXgkhVcpknnhq3woIzdK0TMYhBGwW+rMT4 RWSUPL43AF/+AUdbqduQDm6Q6FaUUGtUGuoKH9SGWBmM6pquLxk7KUe4huhS2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762862881; a=rsa-sha256; cv=none; b=RbbLgqf45vexrH5Yu9hVB+2j22HMAmc3xxCfHp09AwylkguUk9VUoEJ6BUErjJsYWpULQP oRmsh5p8e2ZSytHjIhTF2PJvhHHGRCMl29usahezlMAbLN6UHEzKPD6fqyR/IJTD9XdLjz e76ikJ1wI9h/tPjP3TLNP3jiKPFakDmwHYK8UCZdDHqopaJl35p4/pmaldNvirHwppRSRh pIF3YcJJBTgpHfzEgslp2ZvZ89Cb9B0q8xWk+YLQpBYoCjFJUy4YXFfydbPGFkd3pC/YrX FBHAC2obr8/XAMcJZAXvGNn148uyequTtydwtsOaIuEFfj656ddmikRnCY4zPw== 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 4d5QKF11zHz13Zg; Tue, 11 Nov 2025 12:08:01 +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 5ABC81LK034812; Tue, 11 Nov 2025 12:08:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ABC81dC034809; Tue, 11 Nov 2025 12:08:01 GMT (envelope-from git) Date: Tue, 11 Nov 2025 12:08:01 GMT Message-Id: <202511111208.5ABC81dC034809@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: 482d0d978855 - main - sound: Re-arrange sndbuf_create() arguments 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/main X-Git-Reftype: branch X-Git-Commit: 482d0d97885506a5eb2b1f2501f65e7e4fca6fdc Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=482d0d97885506a5eb2b1f2501f65e7e4fca6fdc commit 482d0d97885506a5eb2b1f2501f65e7e4fca6fdc Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:07 +0000 Commit: Christos Margiolis CommitDate: 2025-11-11 12:05:07 +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 --- 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");