From nobody Sun Oct 02 04:29:43 2022 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 4Mg9wm39p9z4dt9y; Sun, 2 Oct 2022 04:29:44 +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 4Mg9wl6LD4z45Rg; Sun, 2 Oct 2022 04:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684983; 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=NUGUWa3ZLo4tPSKFnTXx9sNO+PAP3baYkcZK8LVGSO0=; b=dMjRtUBC92+imx1y3NqRSoIYmLmRk3GitdqmULYE1tgygMe2ZuAMb3TYtxfdG+XdJvDF06 b8/k1pSKOvpyWFP1rjfGQapcKnX9VafDyILrfOVMcNmbHG2nIKBjW4WONNXgT4IyiojKMr rpGB/Jg8l0Cir5kyOdj/6Hv1dGdYLlYit7DjaJ+ZT3fi9zhMEdD4moLF4Ns+O4yFDaUA9P FWIEI3rfM9IkpV+aMdMl3gJZVk+/JpoXpnNvFAzV6nH5c+5in9lxNQJI6gKAIt/UQ034fh amHFnzPe5/r60eErJU4DePlYon8pC+Fay224dpB5Tbwzlv3h/01HJx6uVkpikg== 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 4Mg9wl5R1SzlYK; Sun, 2 Oct 2022 04:29:43 +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 2924Th37058571; Sun, 2 Oct 2022 04:29:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2924ThYT058570; Sun, 2 Oct 2022 04:29:43 GMT (envelope-from git) Date: Sun, 2 Oct 2022 04:29:43 GMT Message-Id: <202210020429.2924ThYT058570@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: c74f4936fba4 - stable/13 - ess_probe: eliminate write only variable r 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: c74f4936fba4f32edb818059c75a2fb0fc805ab9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684983; 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=NUGUWa3ZLo4tPSKFnTXx9sNO+PAP3baYkcZK8LVGSO0=; b=BKjKGMU9c9kHQ7p1kQIKqz/c94MBSA4VjC2XgFJaioLww1IvIZ4PH4qc+GNWnt5Q/UuDq7 upm/zJmcj0DCk20k3O/DalfiqRHC4VH7mzYHDRt+j6NfN+dE8wxjvfP3+D5Dbyt1pg8lZi gylE6SK1PPfN2fkTnIPd7b9ZrF1j15zxnQCYTc55txLfuAfVaXxNuHoz1FnfqVLwhD3KKV rZdOMXKjDxHypqEsqLuqp0Dyv/la4owKThm/UnWG1AiagEpAMtjEIz6wgjcQ9fv5GywX2j E0uSIxYLmBW8nvTYNr2cPjHgPWowcPYKq/1X626M3nvizQ1/ePiQxb9UH2UUOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664684983; a=rsa-sha256; cv=none; b=m4JK7i2qQZTLza333e0Ow28TP/H6KfqqcvVFXmgspunn4nR08B9B5VL9RkwkNvxLeJsqIa bNuOM+mf+G8W8UxA46DUVUHWp6rwAJimpAvVRQgFui9US0M7cySOnOk9aXfkHj8zsHswXI Kq9y94ENTPh4k4ULOnVEqOgy+WP7mnadYWH4NN5aHsEqmJOYusilsXaxFaG4fYDDhAh++2 yp4Hs5OfRQsJo0FLtr8/3HtuWeuLsANoD5KBcbxs+C6aadKlMffoU46rwwB05T4S4MF9YZ np6KEZVP1thSHF4tSAP3THmGkJZMA1mz491mzhCwkDhGet4UbDXiB4olItENEA== 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=c74f4936fba4f32edb818059c75a2fb0fc805ab9 commit c74f4936fba4f32edb818059c75a2fb0fc805ab9 Author: Warner Losh AuthorDate: 2022-07-08 17:53:32 +0000 Commit: Warner Losh CommitDate: 2022-10-02 04:25:54 +0000 ess_probe: eliminate write only variable r Sponsored by: Netflix (cherry picked from commit 3a7365acc813173c02c4346044615a18e29b71ac) --- sys/dev/sound/isa/ess.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c index af34ee38ad04..ffdf60a8d2aa 100644 --- a/sys/dev/sound/isa/ess.c +++ b/sys/dev/sound/isa/ess.c @@ -788,14 +788,14 @@ MIXER_DECLARE(essmixer); static int ess_probe(device_t dev) { - uintptr_t func, ver, r, f; + uintptr_t func, ver, f; /* The parent device has already been probed. */ - r = BUS_READ_IVAR(device_get_parent(dev), dev, 0, &func); + BUS_READ_IVAR(device_get_parent(dev), dev, 0, &func); if (func != SCF_PCM) return (ENXIO); - r = BUS_READ_IVAR(device_get_parent(dev), dev, 1, &ver); + BUS_READ_IVAR(device_get_parent(dev), dev, 1, &ver); f = (ver & 0xffff0000) >> 16; if (!(f & BD_F_ESS)) return (ENXIO);