From nobody Fri Jan 2 17:20:59 2026 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 4djVpM3R1sz6Ly5d for ; Fri, 02 Jan 2026 17:20:59 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVpM1vGkz3G9n for ; Fri, 02 Jan 2026 17:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767374459; 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=y4M5fqhf08AJjwq8mwAM7UQRpscb8N2gOhKCSE5PcyQ=; b=cMRLeULh7GabLSJiVL4G8ockzETZ9WzbUtygtinBb8T+zHEJ83QcPSr06H/vKltiIvq/ee WxD2rDB8ivY66okwllhvJsBIhmgvfJtF9Vgr28MlDjaIL35fk/gTvtpXWppane7UEp1zl2 MOC4V+AEcL5t5n0szoKP+zCY0vk8KOeOTRTeDG80WcuIxP2sZZfmosxcbG9ypYDpxlMi5G tK5pOe989uHjS63gcVANJqiQbJ0Y1Cs/hv7HWtkCxrNIdCMhtQ30WwjqosCobMIdNyeZmo mD/PdTUr3I/os6r0UU1+DpZzrEuFPo6gzd95kABLU5cNQWxhdcCnToVydETldw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767374459; 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=y4M5fqhf08AJjwq8mwAM7UQRpscb8N2gOhKCSE5PcyQ=; b=idNGzoZymZNlUop3WXM8jcJb5nqbkmLmzlYlpbJGgX/CfXczfresX6jBun0ROxfpyjLLXX k8Wm0b6ChVj6DFl9luFPtbH5lM3bwWK/FuF4Q7UMbWIY8Yw7FQppXO2L2iADd4rVhYcI6J 31cgX/zD7I5gxZTa3DnTX4hqSO2sWNd9JZb5d8lPyEINjqXBfK5vtepcos23WTELHzKzZf JHk2uyr0dfsIWvKKq4flCktXjR1EOsw/iuz2KN6llWS3crmBNbPyVNdrBt/bY84tRLPrZs KyzLH866OX9JOiRcYYDFrMLZaRvbYgqXkQC7r5kxqR6dkWZ/2cO2eKcwx/xvyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767374459; a=rsa-sha256; cv=none; b=ozeCHhk2mi1egEhK+zCLmmEl09CXOe6KPjSq3DTv6tRPZn07DQpae/i6s9kNaTzaWTlrSq UQ3yrbkNSFYr0Cd8L7EgMEsQA8z1GFL8//SWv1xyboKvuULDJItQFt2nOhOXTQ9h9ps4Di hyHODZDZLoatmpBe1MD4dD1ZxMJdKe5cSWhD77FpPbzRP7tqadTPQ82ECZbQRkQrhHDU/6 HCTA2hDODPnJzhBNLbHQRNVZqKewbLQDaQQw+wNcwiHdcuwvthru8UP89GnM0362pbo5ej RGrMs/bwWClRZlffh7vZ84MeR/PT1ePii5ePtoSZLs8BPRni6IOgFgAOzWhYGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVpM14GFzC4Q for ; Fri, 02 Jan 2026 17:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27212 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 17:20:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 0794365d5d3c - main - sound: Merge chn_intr() with chn_intr_locked() 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: 0794365d5d3cc93940b873553382288a2a2c88c4 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 17:20:59 +0000 Message-Id: <6957fe7b.27212.60e2349c@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0794365d5d3cc93940b873553382288a2a2c88c4 commit 0794365d5d3cc93940b873553382288a2a2c88c4 Author: Christos Margiolis AuthorDate: 2026-01-02 17:20:41 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 17:20:41 +0000 sound: Merge chn_intr() with chn_intr_locked() There is no scenario where chn_intr() is called with the channel lock already held. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D53854 --- sys/dev/sound/pcm/channel.c | 20 ++------------------ sys/dev/sound/pcm/channel.h | 1 - 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 7c3f0e3dc9f0..011dc1427c2e 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -581,30 +581,14 @@ chn_read(struct pcm_channel *c, struct uio *buf) } void -chn_intr_locked(struct pcm_channel *c) +chn_intr(struct pcm_channel *c) { - - CHN_LOCKASSERT(c); - + CHN_LOCK(c); c->interrupts++; - if (c->direction == PCMDIR_PLAY) chn_wrintr(c); else chn_rdintr(c); -} - -void -chn_intr(struct pcm_channel *c) -{ - - if (CHN_LOCKOWNED(c)) { - chn_intr_locked(c); - return; - } - - CHN_LOCK(c); - chn_intr_locked(c); CHN_UNLOCK(c); } diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 0b17c4a130a7..6415f5c88984 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -298,7 +298,6 @@ int chn_oss_setorder(struct pcm_channel *, unsigned long long *); int chn_oss_getmask(struct pcm_channel *, uint32_t *); void chn_resetbuf(struct pcm_channel *c); -void chn_intr_locked(struct pcm_channel *c); void chn_intr(struct pcm_channel *c); int chn_abort(struct pcm_channel *c);