From nobody Tue Apr 14 10:31:56 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 4fw0vK0XLbz6ZZYG for ; Tue, 14 Apr 2026 10:31:57 +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 4fw0vJ1Stfz3SWj for ; Tue, 14 Apr 2026 10:31:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776162716; 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=wMEp1o4hkiKxSgMRx4zEyRgxDwhlaWE+pW0VET+g7gU=; b=WN68rAfw8yzabHfRaXhIQf1OwE+pDiTHTk9DlQ6Eby6XTBKlQiBdLzfFbqQ998p/WW0XhH vvjJlxgDHlZV1L42HAgC+QJu8VAdPGAN2bgjONgBpBsxfnbAZXv63R09xbfm2lUJ/AugF9 vzRXevezbwquiyUzFg7Gow0vfz1TEsXPqE9uYAbs/QmjWREkGJ3fiBa/Iqq8MtMw2DiXds MvsbyUqJApQW1JXv/8DBqy+poKxATDo9OfAXDeGsI3V7qp2DNxLX4SjTnMHXaFrhwMUCGY ffMEBANB/w3QOMYrB3/mzsNyjkgrD6RfbWSaNfbkDNEEAtm44Oq1Nxnd0zdfxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776162716; a=rsa-sha256; cv=none; b=p6pD6B7YK7NCaYDeNnH8NkVm1MhOt7DImRARqyXuhjNw+Ww/kZCuy/Qd5460R+RaNFMBkk ZuJK9r3sPzRw0xlGt/6CySwRmBtt3PG1I+htepJSGttelGjk78W9VY+YZrAW+e7ibmZC9r XwRJkfiQTUyVjmicvkvzpGRmZETGB5mCoTOrJNUiYOMw+tEZhJ8wXrWvYHLPamltsiMNPa WJ4qA1DYtCVeWHETOwDvcpzs7tjQbNwAA+WX5yBzJ6Gdo54NfAQKgaZSX9T3moQCc05p9d 3Vm5uiF6cKy7XZhoOR2iu/sfIcBgYmNjhQhrhAhSxbNWlNxfLdqC0YMcU1n07Q== 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=1776162716; 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=wMEp1o4hkiKxSgMRx4zEyRgxDwhlaWE+pW0VET+g7gU=; b=WCYVt1Lj4yvFTDnYWLCjttLnlKGbZZMU+j9YgewISi2/jGQpOTy2HShctkJz3SkPmp/jNg Z4OFC1OhVqVUI1W3M965Bs7qKOg8sje/8O7nUE5W80G5+TX3JtTNGm4+C4LEl6/y1vRokg bPJwjCA0qwwVb9Sw4HA9gsJR29p5J3g7sb6P6VpTiYB2NzfV0185qsibAdYtUlnPcydNus AvHlgautkC7OYBKjNZ6w65jHm5jn3oVd0yXnO9jZoFdbr1gecPrGT+AauAlo429Pt8yUgN kUYDKYU3fx9Uk4CI8aR85tlGjDylS/MPjBk3OHZkZqh1ORwJc/rW3CHQTi2pvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw0vJ0VlBzmcr for ; Tue, 14 Apr 2026 10:31:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26b2a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 10:31:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: f56d0868bac3 - stable/15 - sound: Make chn_reset() control flow clearer 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 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: f56d0868bac3fb889351ca489b31652c169ef92c Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 10:31:56 +0000 Message-Id: <69de179c.26b2a.1f1a5530@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f56d0868bac3fb889351ca489b31652c169ef92c commit f56d0868bac3fb889351ca489b31652c169ef92c Author: Christos Margiolis AuthorDate: 2026-04-07 15:44:39 +0000 Commit: Christos Margiolis CommitDate: 2026-04-14 10:31:43 +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 (cherry picked from commit 8007a78bfe1f41b7055f8677f8ac9ae4cc2fbc7c) --- 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 *