From nobody Fri Nov 21 16:15:01 2025 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 4dCgKf4H71z6HQFb for ; Fri, 21 Nov 2025 16:15:02 +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 4dCgKf1C1qz3xpX for ; Fri, 21 Nov 2025 16:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741702; 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=SU5NKDGlfdWJdFkF3XFdyBOTD6teMEJ0q+DDwDRS3ss=; b=X945j+1R0vzTX0YNqrFP38GYV0tq2k/GJ/jaGutSfQQA4xQ9vLD/EI8Ds/IG/glFwxZiAJ HvNn7UG+fyhLt0/EH3wMZLB6beRw7Om98LtJR2sfFZZeBzUQ2TuxQJPeMXxgh1frHNpUyR RZAzLgdA3KYP7AR7TNiIFevZFpDI57umBGQ1nXzo7aTt53X3Hx93pxfqc+3g2ap98qaI9d Zhtj/Jx70Pj4bT+2ydvl9ejjuHJBumCO1ofXJZJyDXGu8IKaWHWbIYjsyIsR0UPF3Bgqhu A3E4AasP2hZtRqM1MJr9NxJtq/VQ8gfx41vJN0UylCkPt2a7JD6qpbLElunZHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741702; 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=SU5NKDGlfdWJdFkF3XFdyBOTD6teMEJ0q+DDwDRS3ss=; b=IM2ZeMOKRKwpkCM2wjFki2gz0kHFCMs2V5bQfGAmIk9peKQUA+n7OofLq2E6o28RAplmwp 7A+NpO/jROOPnxzr2pd6E+koV00oa7d8RMD8KErmGqeMoPa+BXuczRVv2bcgnd4KKyjUF+ T82jhRB9TB/NxCJwg1NbH7bV2HdbyNnyennknkEWEA8Mb6VQ+6O5TbnU5qx0z6Y99zWrkt herbEWWFLeO4ChrEdx+KDELDbLwJaRoEQgcP4KAcKc+HNBROLnNQLxfrl1sFkEFqYFYFku nhN3ce0MHt9G6oqVqHJdDv8JQmMcgw2JBuWsfq8kULt/vshyLvYiLNM131SEyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763741702; a=rsa-sha256; cv=none; b=s9PYfNYruOiwu3WwjTwpAl3qkOm1sZiyozSBQbl8JAFX1C4hS2p7tRukU4a9Q31y33B59l bZLgg72fTcuSNaGMXZPhe27v18KpMvR2qZouQoc26SCeHohOOirI8KH2Gdonzqb/5JeVFG O37M54uSk4OK3fVb+ky7Re4P9JPs5P2UWikpEelswergUXGz+6DBB0xy9NqG2CLmxvaR3z lbXV05MKP0kpsTDOLz2AgUJDT7MSZyXWFC3Kcp6UFsZJg0277Ebn7P/qsW/tTou+ODgDXh 5YW5/f33TwSVQy/80AwAwsB76SBJKyOJw5hqRNBzi0S33h4lNfpZk61VRq5GCg== 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 4dCgKd6xRHz3m1 for ; Fri, 21 Nov 2025 16:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3652b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:15:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: e254ef87a30b - main - sound: Merge chn_intr() with chn_intr_locked() 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 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: e254ef87a30bfcaabc6e4d8e0ecf05f6949a4f06 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:15:01 +0000 Message-Id: <69209005.3652b.58fc1f99@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e254ef87a30bfcaabc6e4d8e0ecf05f6949a4f06 commit e254ef87a30bfcaabc6e4d8e0ecf05f6949a4f06 Author: Christos Margiolis AuthorDate: 2025-11-21 16:14:28 +0000 Commit: Christos Margiolis CommitDate: 2025-11-21 16:14:47 +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 e92181d74e19..736dbec0eff2 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -579,30 +579,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 15180bc8f0b6..40b82f2caff3 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);