From nobody Wed Jun 3 08:23:28 2026 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 4gVgh03V9qz6gK0G for ; Wed, 03 Jun 2026 08:23:28 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gVgh02QMJz3fyN for ; Wed, 03 Jun 2026 08:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780475008; 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=3dFreNaEIACWtLjJx4uJoLu31kaAYxcuqd3n9Ws8K98=; b=Ue6LeOI5WBe3F0tXr394IfCmwTIJNqNCkr+QZ1SG3RU5iwoTEyt3tKTFVgYQKs30hLMEVq kAoYrWSA/5YHGY7Y4kHScc0X6XfojMMFIFamFKnrb2Xz9PROepI12vmBxwd9KZOdsEds98 /HTlmyaqnovs8f9PuCC8B9iAxunjH2irpm0jH9apKmkOv5clldapDktkHI6smQeFNuYJn1 lKNj9/ZI2HUju7vTyJTQOOxSFctfeT2rkWIFkR+XfW8JMNSO1an/ntew57MA+wB8TGfO9T GPmR673th3VjmwmeF5q28ecjBRt9D/6F2y/1R3efKlLmVdQSzhee+VPc7Mhg/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780475008; a=rsa-sha256; cv=none; b=BU5V5z1VG2ivvajfg8SwWqQ8oCl0p64LmzAg6Lvx76J3QVJyHwOKDKBscQT5LN3Sge+xds Sjh4gW3zZRdCFwbZY6Af0tI13UFo88Zja7bESYK2gpctJD+C5P2+cfx+ySzjbEVmO8eilP X/LfOXW4QtCIAYzggKnSBmnfVHoHWSTmMOvA7Qm/IVuOgCI9TdncXD1yBbyGUyUHF8GXr2 4MhUNXpfU3ChHALEJvfnuax6ubf2EIgH7b3AUJA+r5OfvIQy3kUbq1ij6IK/VZD07LzXgy zCQkBVoo1wqPqF+4XCUfGf9fCUm3wH/e/K7gALT3pDIrRsTKYkNVYWH6UicP/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780475008; 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=3dFreNaEIACWtLjJx4uJoLu31kaAYxcuqd3n9Ws8K98=; b=sMX6Ihphdkvx8OZ9xHgK1h2W+J2RV9WoMd7ttPWjqkXL9ZEHsNwMCLgQp5hPf/NqWDRR6z +Cgl9B2cILRUS/DvQD21CaXyEyvQqFBq3MyJO5fooEaZVel6Lo10aZWnbqM3Q8gK+Q/mGp ly28Y4620bvzR5HF3YVfsxZ+16TJ2J8m0OmQSNh2NYywFUu3OGu2OxOCUaJ2mAo0ALE8H2 7yRt7FZMV4wBbmrnggGomKsz6q+5TddKL3e6lqDeVB1D9S4zUnTDsvhvJcplgkfE9xl7YZ lR5ls3QHyCge7WqmM8+TfKH9YPCYUvLpiGAogIb4VBZ12fdmgSRzw37drhw1QA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gVgh01Mjtz13rc for ; Wed, 03 Jun 2026 08:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bc76 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Jun 2026 08:23:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: d80356b7525b - stable/15 - snd_uaudio: Stop using mixer_get_lock() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: d80356b7525b2d07fc192635489c74480a683e3c Auto-Submitted: auto-generated Date: Wed, 03 Jun 2026 08:23:28 +0000 Message-Id: <6a1fe480.3bc76.15365c60@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d80356b7525b2d07fc192635489c74480a683e3c commit d80356b7525b2d07fc192635489c74480a683e3c Author: Christos Margiolis AuthorDate: 2026-04-16 12:30:25 +0000 Commit: Christos Margiolis CommitDate: 2026-06-03 08:23:03 +0000 snd_uaudio: Stop using mixer_get_lock() There is no reason to lock snd_mixer->lock here, since the only thing we are doing with snd_mixer is to call mix_getdevinfo() and mix_get_dev(), which are one-line getters, which are needed to eventually call uaudio_get_child_index_by_dev(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/18 (cherry picked from commit e87654db5a0923856afbaace9bd0975331782044) --- sys/dev/sound/usb/uaudio_pcm.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c index c24c111f983c..4b1762cfc3ec 100644 --- a/sys/dev/sound/usb/uaudio_pcm.c +++ b/sys/dev/sound/usb/uaudio_pcm.c @@ -134,39 +134,18 @@ ua_mixer_init(struct snd_mixer *m) static int ua_mixer_set(struct snd_mixer *m, unsigned type, unsigned left, unsigned right) { - struct mtx *mtx = mixer_get_lock(m); - uint8_t do_unlock; - - if (mtx_owned(mtx)) { - do_unlock = 0; - } else { - do_unlock = 1; - mtx_lock(mtx); - } uaudio_mixer_set(mix_getdevinfo(m), m, type, left, right); - if (do_unlock) { - mtx_unlock(mtx); - } + return (left | (right << 8)); } static uint32_t ua_mixer_setrecsrc(struct snd_mixer *m, uint32_t src) { - struct mtx *mtx = mixer_get_lock(m); int retval; - uint8_t do_unlock; - if (mtx_owned(mtx)) { - do_unlock = 0; - } else { - do_unlock = 1; - mtx_lock(mtx); - } retval = uaudio_mixer_setrecsrc(mix_getdevinfo(m), m, src); - if (do_unlock) { - mtx_unlock(mtx); - } + return (retval); }