From nobody Wed May 27 15:33:32 2026 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 4gQYYT0dzHz6fCpk for ; Wed, 27 May 2026 15:33:33 +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 4gQYYS5gPKz3XSC for ; Wed, 27 May 2026 15:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779896012; 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=l5zbGz8SEb48hEViMCKZ00onjDI2ocdiDB6gYdOGkaQ=; b=Y6kReIsPjvLsPYlsG2j4166UjUS9OT8K+bP9bT18JMimrIdln0d09nW0OM3jag/dwdSibh IRk/lJVontRAcx8HhMewE0nruJpuJyrfD9WFhcoJxbOszFLhVodmQmNY0nnUUZt3lqVvQQ go60TnmsrbCLunVAZd6z6gtmX9QkFwDpl0KK5sv99R9yRIlNaFHBG4TffiPuzLQ9tY5PEj 7cIaIUYKZaYx0t1A/LoOFQA3ELsxDU7D9EbWGWgfccs+oXg7nNMmf4UUifj5u6EnLC1QU+ BoILRL0UqJ77Da4FUv91I99nogDLgpo+zSWb0po535l/KvB1XC5MKR1SD5Xv/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779896012; a=rsa-sha256; cv=none; b=JvjmwIqzvzWiekKv/E+IqJ4kOUUm6tQ06CCHqIuI8uBFcXxVtMDv/0FrAMP571ueYH40GW 5ab6/97X/UwLEusGGCDmIxotfiTWv7TNCcU0C+QURj+OGh1JLb9eZPituoIfwslbP9apWH ADGMMTdavbJaILhIXLAXQmbjYJrnEds/nvw1/CVijeE1DFfJGC2h4PgO/7XTH00vtQQgpM xf6tBfahXsFkjaG9f8FB0qQbbBmWMmTebgE3iKnfoZWyE6Fs58Db+ufu8qT/MNLAvATtjO KVfjtx+5LsATlS+aLk3FG7WFpjYwFahLuU7QAM+7u5hFHFZaW/VkCLTt/wyWLA== 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=1779896012; 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=l5zbGz8SEb48hEViMCKZ00onjDI2ocdiDB6gYdOGkaQ=; b=Ssa/Kt/kvrSMFHelj3dLOOa7OsSAWh0d6lzru7DxofxDkzzHONFw8eBj24tzr4Ms3vt120 f9ft0vDNpk4+mIr6mOltdJXG/lcmuFW1eeH2P5oJg341nHv/qFeYtjbSVNhbSNAB9RRMQG JLgbKdCVkCMtHzy/q48LlIAiLrsJwn/6zYkmNc6p3OvyHBC085WccWxyBZ5JeniAEFKAcT uCZjx/d0AFtq6jEixLUvherXP16jhL/d5MwFy1zjbBsx+vs77lg7Dj2DQSKaoTiMgJp1Vr ud13XBHa4TrivEkVtOOUo60OjdgeRPIrRgAEa8mvxX9Law7q1utjcsPzPEXzyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQYYS5DSTz14gx for ; Wed, 27 May 2026 15:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27fa4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 15:33:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: e87654db5a09 - main - snd_uaudio: Stop using mixer_get_lock() 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 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/main X-Git-Reftype: branch X-Git-Commit: e87654db5a0923856afbaace9bd0975331782044 Auto-Submitted: auto-generated Date: Wed, 27 May 2026 15:33:32 +0000 Message-Id: <6a170ecc.27fa4.15e5474b@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e87654db5a0923856afbaace9bd0975331782044 commit e87654db5a0923856afbaace9bd0975331782044 Author: Christos Margiolis AuthorDate: 2026-04-16 12:30:25 +0000 Commit: Christos Margiolis CommitDate: 2026-05-27 15:32:11 +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 --- 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); }