From nobody Tue Feb 25 11:48:19 2025 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 4Z2G8401pYz5pjm3; Tue, 25 Feb 2025 11:48:20 +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 4Z2G832Snqz3kNk; Tue, 25 Feb 2025 11:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740484099; 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=GNEvXzD0NbYvN4FtLjVHLRfmlVbF55k9rPrjy9qqQD4=; b=fEbWzGyK2shhLwwAEPnwRGop4cn/j3qCUt7vZfVpFfHyU8LO63ShkFbCiO36ubhq2+NkFa QZ2sIrmMGJZQ25xQCoLkgh0akOptSwEvPQam/bLb6Z0pOZZk1HVJ4sBdrjFyFocm02I8jp tYZRLhF3x/t6uc689xz8R53Cu8v/stSuE3izsPev9qkg5INiriUBEqav3IENac3/78Qz1Y 7N86jMRid3lzqaTnn/WiWt4tKzIienLJSHdq/Pwr/T2MUsP2jkr3KLlybRl9HFvUmB0lZO BSZDRz7jQqPzC/8UIWQKoWMmNMs2y5Dfd8TaF3Q5cRv9Om3dLnghpGnkApTxkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740484099; a=rsa-sha256; cv=none; b=a3xet1aLOukrCM++ryOLYCpV0eCOo6FEaMEVKje/KSzVlChACT6ZUAVpLwFawV+dlfu6qY 5hAGrLKrz8ux9lYg+zbw9IvTLutjfNua+uGVw4i3Dr6yZjXiqqdjHvvuch9GdutAz1wkxm xQubYWo2nbp9dEBEf1fS0/cQeOYQ1h8lRQuAAfNv2InmGtXgfu3deZkLvqfqK+gCbIl3s7 T4TVRux+0GInpx0hvzgM6q3+8s7PaJA1Plsi+mvA1R/rstLV3sA9nmtxPH9YoNuw26HvBd 9b1uEMaoYk+kgEWMCf3gEBJQqnqkkQnMIe0r5OrG66PCQhVnG7TqYJTPia1lnw== 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=1740484099; 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=GNEvXzD0NbYvN4FtLjVHLRfmlVbF55k9rPrjy9qqQD4=; b=ymioF/z4jPQ/Phrut5uf7hw9Cgb+PhW6cUFN4kkTihECKkz42cga44IJMMGXiVht8ueWuJ 9NSZNzUGVspuCoIfPyR9qiT8+jqD7wvwTvEjoa6CsrhV96E9xaNdSrKQpE1k0Ii+y/nfvZ UCsOzvZpLQoewetHUjdQ3eNGSDCFoON1UpTnjbCmaTtg+test+whDtalX7nme/rs58g7rI l3KDAi1ATs1ibklQbT0vobm13wan9D39yYZTz7UR7qV13hR83FETXScen1dr0OjBW8Tg4O bKx7PmsAcDnYjW3L72ubOvpLegcfwzT55UayKa2ONa4MdHQKZCAZ3SXKxm601w== 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 4Z2G831svZz9Cr; Tue, 25 Feb 2025 11:48:19 +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 51PBmJ8E051033; Tue, 25 Feb 2025 11:48:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51PBmJhD051030; Tue, 25 Feb 2025 11:48:19 GMT (envelope-from git) Date: Tue, 25 Feb 2025 11:48:19 GMT Message-Id: <202502251148.51PBmJhD051030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 4e1b75bebf41 - main - sound: Get rid of redundant variables in chn_setspeed() and chn_setformat() 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: 4e1b75bebf41b6e446d72c755fa420836341ade2 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4e1b75bebf41b6e446d72c755fa420836341ade2 commit 4e1b75bebf41b6e446d72c755fa420836341ade2 Author: Christos Margiolis AuthorDate: 2025-02-25 11:44:05 +0000 Commit: Christos Margiolis CommitDate: 2025-02-25 11:44:05 +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 --- 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,