From nobody Tue Mar 04 15:47:03 2025 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 4Z6g6J6HrNz5qGVs; Tue, 04 Mar 2025 15:47:04 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z6g6H4L0Fz42DT; Tue, 04 Mar 2025 15:47:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741103223; 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=D8/homlH4ngPnz2qBuZzzmVNkvvI3aLLNj7bnq9NZHA=; b=bKY01nVd9yPYUb9kcLuYtUxM4WekFU2zrE0Gf2S0APLMCS4W5ls75IObgp1fyzCrFSK2tD C88PV2pmlL7Akx20oxZ25f85RCRrTgQTCvLaSkCALXsTh81XmfFpQtGEkWSIAQL/ZfW1BJ 422T9s3TChFSZ+h8veocvnHY+zxAkAus2V497Yk+M8kJbftcMREKa4n+mlQP8NE0hvoX24 HunXLDN7vmBc10TVZae3vz5us02TFelUw1jMfRY8/8se8IhOApKg8R4h0BqdFi3l2xhFy1 8pTQaHg29AXsi71ubTL6oZeaF/oVUqBA5MLxodNKdvzS6XmNlH+MQ5xCsUmZUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741103223; a=rsa-sha256; cv=none; b=FDUTzqc7aZ6oC/RKyqbRTtUv3QTYGxO9TbDtXUOPf8nOoKL41lVX8v0Qy2UAq3kyT7EwKc /G/QycKOxErusDY5hSw/dY5pk/SgYxoZMT73XLMMZ9C+veEQl2mxwfOxBqyxOg1+3CWsg1 nL1Qy88tj3KUiOut0FXj/0FVsdf3mckNPtKfcwqboaP5OsAoSnsQYb0geD4NipuSjAAzH6 S5I+zUYCtATCHeOdC1IjYkVUrN8I9SDoqhEYUdWz+OJvjD6m+ro5BM3W++oC3ZD4TEVsQy S4xe0Nt1VBk+H4uCV5c3PmeubX11Wy+1xNvQ1mmQoqCvk4K0/DrQX/GJV7nEVw== 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=1741103223; 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=D8/homlH4ngPnz2qBuZzzmVNkvvI3aLLNj7bnq9NZHA=; b=KUdD53UK1vbfSP4pGjddLAEOk6MuCB8wnul4zFvzE0a6nxoZYDYPFz8nBU+taAHT5uY9kI DMo26flFRgYCHyu1dp9blet9r5PuQh+2KO/onR/Bix/q6Ra+OzVBFSekX1cPpiyE+fQqY6 yJdoW2Y9bRqI7ETvjNc2EK/UgNgtE7VOAou382nhCRSSNK2sfVeOdfqcIFTDQ/P1g5tD7N EWqKHgJL8hVNiS8VTrVFyY0AgPk2j5Fy8FRt4AhhkjNy+OqqlEDFjS6e2+y5wzwq4Pg3A0 aM4CJSz9pTAYQzLn/Sr4QQpqwJLiy9B7IWpzmohei/TO6BYo77bzC5SEROL1EA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z6g6H3ZKxz8FZ; Tue, 04 Mar 2025 15:47:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 524Fl3gC050031; Tue, 4 Mar 2025 15:47:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 524Fl37i050028; Tue, 4 Mar 2025 15:47:03 GMT (envelope-from git) Date: Tue, 4 Mar 2025 15:47:03 GMT Message-Id: <202503041547.524Fl37i050028@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 9091f61d2f2c - stable/14 - sound: Get rid of redundant variables in chn_setspeed() and chn_setformat() 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/14 X-Git-Reftype: branch X-Git-Commit: 9091f61d2f2c947a29b4f7709232070e90f5cec2 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9091f61d2f2c947a29b4f7709232070e90f5cec2 commit 9091f61d2f2c947a29b4f7709232070e90f5cec2 Author: Christos Margiolis AuthorDate: 2025-02-25 11:44:05 +0000 Commit: Christos Margiolis CommitDate: 2025-03-04 15:46:06 +0000 sound: Get rid of redundant variables in chn_setspeed() and chn_setformat() Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch, emaste Differential Revision: https://reviews.freebsd.org/D48011 (cherry picked from commit 4e1b75bebf41b6e446d72c755fa420836341ade2) --- sys/dev/sound/pcm/channel.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 17c11dc33b7a..19b2db321cee 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -2104,21 +2104,20 @@ chn_setparam(struct pcm_channel *c, uint32_t format, uint32_t speed) int chn_setspeed(struct pcm_channel *c, uint32_t speed) { - uint32_t oldformat, oldspeed, format; + uint32_t oldformat, oldspeed; int ret; oldformat = c->format; oldspeed = c->speed; - format = oldformat; - ret = chn_setparam(c, format, speed); + ret = chn_setparam(c, c->format, speed); if (ret != 0) { if (snd_verbose > 3) device_printf(c->dev, "%s(): Setting speed %d failed, " "falling back to %d\n", __func__, speed, oldspeed); - chn_setparam(c, c->format, oldspeed); + chn_setparam(c, oldformat, oldspeed); } return (ret); @@ -2127,7 +2126,7 @@ chn_setspeed(struct pcm_channel *c, uint32_t speed) int chn_setformat(struct pcm_channel *c, uint32_t format) { - uint32_t oldformat, oldspeed, speed; + uint32_t oldformat, oldspeed; int ret; /* XXX force stereo */ @@ -2138,9 +2137,8 @@ chn_setformat(struct pcm_channel *c, uint32_t format) oldformat = c->format; oldspeed = c->speed; - speed = oldspeed; - ret = chn_setparam(c, format, speed); + ret = chn_setparam(c, format, c->speed); if (ret != 0) { if (snd_verbose > 3) device_printf(c->dev,