From nobody Sun Oct 02 04:29:52 2022 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 4Mg9wx0STgz4dtK4; Sun, 2 Oct 2022 04:29:53 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mg9ww6Pqlz45lq; Sun, 2 Oct 2022 04:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684992; 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=ROkcNlvy80w4/L6XI45SFjqXfPnGtuz71pLq5dIvlCk=; b=YwKBRtnASMmQp5krgyR1svu3PJTji6fVpRvgx0QHUeq/p+MaqHxk4RjS0mxyAO4xgPl7jT 27OCG2ddH8J12ZivAduHFnhiq2RJoodY8LRw5y3rqpevO7eLYi9B+H6PyEjarVaZObPZ7i rMNhb9a3mSZzL9uS6kXt68YeoRq0g4365r0krIVho/ijGfuYALi/AWMyHn13E2/UBycZJF HhtMOiF3MqxOi04v1D1sfQ3yp8HIaiUvOoXy9kh+rICUKTfOqTgyfoP0QhcBjTdQ91UDN4 1YDUywBCIrNAONmnnR7DNlbD6h2VKvDhVJHXzo1ZHIk/vgxDjHu529OVq3pjvw== 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 4Mg9ww5Nk8zlKM; Sun, 2 Oct 2022 04:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2924TqdN058774; Sun, 2 Oct 2022 04:29:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2924Tq6f058773; Sun, 2 Oct 2022 04:29:52 GMT (envelope-from git) Date: Sun, 2 Oct 2022 04:29:52 GMT Message-Id: <202210020429.2924Tq6f058773@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: b6e4f5ef2b6a - stable/13 - emu10kx: eliminate write only variables val, r and move i to loop 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b6e4f5ef2b6a194576e12133c72ead8fe7a9c477 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684992; 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=ROkcNlvy80w4/L6XI45SFjqXfPnGtuz71pLq5dIvlCk=; b=Snu6llDLlvLrhE/ga/PcRIWC1WfaMDT2jVurWWYNH1L7ZAiqAJez/7ekdm3/4LE7oZBec7 WIMN0pYsQP9P6OwqWtpck03ddleWoIz2weSdAIcXhjb0w/fBAmWTpjMqzSOWNmH8yHrf3d s6ZxRRVoIyWuEXWCuocwL/9T8yOzuVtQcrg0E6VedH5gBPOVtHPTjUibWeRaB0Rnj/9DXi kJQoDePhTTsJqhkkmDkCXW2n+rYogx27EtTQYzqdRvvklrgfhfjfR/PdH99npGLR+vLlK0 gVv9sl0zH0FgruMKA0pv49aCkqmMF1C3jgIrK+Lcyxc7upX4qqUEp2lF5r8MYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664684992; a=rsa-sha256; cv=none; b=hsCSduTJ9My2+UvdHrooBd3K/PSsErWh0kBnzv3FduOU8S8p0cBVrIa9Hsuo/PcXPDgwnt K2/I4WeMjG2czpi80NlZTffofYCF8BiSmYMiD4gQIRTQsrp1IM/VSBJUlAcWTbfTiVO1bm +ta838EzYfs4rEzdnJX8asoSwwoh4+xVM4izsmh+MX0+U7mK23Kgt14DOAwlali3+w/kPB 2Jf6rMPPA46Mclo4f7+3OfH96Ufqh3ipsNioUJFgqBD4DANgtpDypKSlk4W8ZbKoyz7V9V pi3kMG3Q9mu7W2g0JF5XfhU3keZ2D9Wb7/SysPYAPeMqt5+IAwaY1ESY3f1e6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b6e4f5ef2b6a194576e12133c72ead8fe7a9c477 commit b6e4f5ef2b6a194576e12133c72ead8fe7a9c477 Author: Warner Losh AuthorDate: 2022-07-08 17:53:32 +0000 Commit: Warner Losh CommitDate: 2022-10-02 04:25:55 +0000 emu10kx: eliminate write only variables val, r and move i to loop Sponsored by: Netflix (cherry picked from commit 8717135d3750b3d0c80c8783c547ffffe255c04f) --- sys/dev/sound/pci/emu10kx.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c index 784fd7e27ae1..85c200631ca2 100644 --- a/sys/dev/sound/pci/emu10kx.c +++ b/sys/dev/sound/pci/emu10kx.c @@ -732,7 +732,6 @@ emu_wr_p16vptr(struct emu_sc_info *sc, uint16_t chn, uint16_t reg, uint32_t data static void emu_wr_cbptr(struct emu_sc_info *sc, uint32_t data) { - uint32_t val; /* * 0x38 is IPE3 (CD S/PDIF interrupt pending register) on CA0102. Seems @@ -740,9 +739,9 @@ emu_wr_cbptr(struct emu_sc_info *sc, uint32_t data) * CA0108, with value(?) in top 16 bit, address(?) in low 16 */ - val = emu_rd_nolock(sc, 0x38, 4); + emu_rd_nolock(sc, 0x38, 4); emu_wr_nolock(sc, 0x38, data, 4); - val = emu_rd_nolock(sc, 0x38, 4); + emu_rd_nolock(sc, 0x38, 4); } @@ -1267,10 +1266,9 @@ emu_valloc(struct emu_sc_info *sc) void emu_vfree(struct emu_sc_info *sc, struct emu_voice *v) { - int i, r; mtx_lock(&sc->lock); - for (i = 0; i < NUM_G; i++) { + for (int i = 0; i < NUM_G; i++) { if (v == &sc->voice[i] && sc->voice[i].busy) { v->busy = 0; /* @@ -1279,7 +1277,7 @@ emu_vfree(struct emu_sc_info *sc, struct emu_voice *v) * this problem */ if (v->slave != NULL) - r = emu_memfree(&sc->mem, v->vbuf); + emu_memfree(&sc->mem, v->vbuf); } } mtx_unlock(&sc->lock);