From nobody Tue Apr 7 15:44:55 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 4fqr9g6Ch7z6YSqH for ; Tue, 07 Apr 2026 15:44:55 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqr9g1SRVz3qM3 for ; Tue, 07 Apr 2026 15:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775576695; 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=k+PAWIAI6wGokY7rNQjSy5djzQxTNrtU1eMdArk4BYs=; b=UwlO+A1d2vIkCCz/SmukIkhcclyz2ngEMWU7z2vjN8qCSjv9y67/B0FwvW318QmdaKXJqd HRWBdMy2aFiifkb8/rjLS+JzgeB56B8oKnGtn3IIEQ0skbmVPuD17QLS0pySRtFm45RbO9 ic0VMbHBPQ0ww88sqYQs1Yf7WdRX4sMARnB5YKJm7QJNvID2y08Ufuj2pBvPPyej/VWkA3 UByLL9m7IJtExU/euTRX77mJZSCa2wenbpSJL8oMDz3nvpW8HhRPlb2ORyF/eUquP3p4lg 2GI9ai1fW1SNm+zdiFSk+uM9lFc6Q79p7ThANnik/5Lp6hCkaqE2R88HDeOsEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775576695; a=rsa-sha256; cv=none; b=H2isvH4tdk6/RDjyyE4ptNj8q74Q5A77I4es8aH7dazUHP9XgoqOiwCWIoemBpZ48LS1ES G71vWRrgpS/vwa1x5LyBJyejWbKxOJ3EZ6fzPf0n7vsaugDeeyNKIE2n7ouGpIi43CXmKp YWPQsIW9PlPoWQj5YN+mYULddLSfq16/oyMHhMaIeToxJ7fbbIV66W3OklglFgPXFTdvpb 5ZGnLxmp/jazLqwUIJ0BB4gsLCEf2eXrPGn8b6ls/6ZrpK7+tV49ak48OFfs+oHfZjlY6U mD9hO7rav3PIGh8W74wUyAXqvB/pdgh/a9P5syrTLzZ2lKENd51n8Qsboy2jKA== 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=1775576695; 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=k+PAWIAI6wGokY7rNQjSy5djzQxTNrtU1eMdArk4BYs=; b=NAFQjJ0lNQkuGcCFHOBuo4R+t5c80F0VRmb5TkTbYMtfeLoRXOrGkE9jcF1KfWkHgJTpFB 5WZL8LsyRihDDKt7LVAScmMc8ArlonIJxgPttaEHieUZUAnnpEVdyt3WBr286bxPr6iI5t 8d0Eamn7L6HkX/LpOVKCuZLP+FhEKRifSwFzi7UWqGUyABbFWmvxvVw+2xPnfC35wQr3Ox YUHV6v5kgNtpJYkhrO71oGh+Vn5ygDZNQQS7AUxyi722bNGKVPAt2lDA8yt2xf3fCm8Mqi mZi6uD7/me3mNtf9TsGJCpjPROY23CGF5+ChNTI1R4o7/1JTHJIfsxhmuZYPCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqr9g0d7TzmRy for ; Tue, 07 Apr 2026 15:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44560 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 15:44:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 8007a78bfe1f - main - sound: Make chn_reset() control flow clearer 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: 8007a78bfe1f41b7055f8677f8ac9ae4cc2fbc7c Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 15:44:55 +0000 Message-Id: <69d52677.44560.6b8b5e1e@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8007a78bfe1f41b7055f8677f8ac9ae4cc2fbc7c commit 8007a78bfe1f41b7055f8677f8ac9ae4cc2fbc7c Author: Christos Margiolis AuthorDate: 2026-04-07 15:44:39 +0000 Commit: Christos Margiolis CommitDate: 2026-04-07 15:44:39 +0000 sound: Make chn_reset() control flow clearer I think this is cleaner than playing around with return values. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56264 --- sys/dev/sound/pcm/channel.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 0b940fe4e843..c1e0d8d3bc52 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1059,7 +1059,7 @@ snd_afmt2str(uint32_t afmt, char *buf, size_t len) int chn_reset(struct pcm_channel *c, uint32_t fmt, uint32_t spd) { - int r; + int err; CHN_LOCKASSERT(c); c->feedcount = 0; @@ -1071,23 +1071,26 @@ chn_reset(struct pcm_channel *c, uint32_t fmt, uint32_t spd) c->flags |= (pcm_getflags(c->dev) & SD_F_BITPERFECT) ? CHN_F_BITPERFECT : 0; - r = CHANNEL_RESET(c->methods, c->devinfo); - if (r == 0 && fmt != 0 && spd != 0) { - r = chn_setparam(c, fmt, spd); + if ((err = CHANNEL_RESET(c->methods, c->devinfo))) + return (err); + + if (fmt != 0 && spd != 0) { + if ((err = chn_setparam(c, fmt, spd))) + return (err); fmt = 0; spd = 0; } - if (r == 0 && fmt != 0) - r = chn_setformat(c, fmt); - if (r == 0 && spd != 0) - r = chn_setspeed(c, spd); - if (r == 0) - r = chn_setlatency(c, chn_latency); - if (r == 0) { - chn_resetbuf(c); - r = CHANNEL_RESETDONE(c->methods, c->devinfo); - } - return r; + if (fmt != 0 && (err = chn_setformat(c, fmt))) + return (err); + if (spd != 0 && (err = chn_setspeed(c, spd))) + return (err); + + if ((err = chn_setlatency(c, chn_latency))) + return (err); + + chn_resetbuf(c); + + return (CHANNEL_RESETDONE(c->methods, c->devinfo)); } static struct unrhdr *