From nobody Sun Oct 02 04:29:45 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 4Mg9wp34tSz4dtFd; Sun, 2 Oct 2022 04:29:46 +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 4Mg9wp1JNdz45gV; Sun, 2 Oct 2022 04:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684986; 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=ds5nkvdQBiEaHCM9KGV1dwizfJ/IysYpcyvhqYcNbqs=; b=v4vws+DJPQ01L/+zzn7siyFbh9OxQbKfZ3nYbHcKeKdO+4UrRI/vHpEcM4xSwnSWPZch1C 9eA8T+jRIr2yA8A21jZoIXhFYyd+els/Mevw5HCcRdZWxJ12xVwkjGBrHy1QPU+dDj6134 zGyw0GJHbTXaPAwrd9U4zAkRnqW3b/vuwVH4bSFiIW4WkTwW5puO+lDIFBN9cYYRq3bxG8 jlYKg1dCBWV/0WgTDx0f+bjrLDg+lQhzhb1cGqdm7CnvrXWet5voBEBjyLWuSsIRKpqUjB taZ5tH3ZqmQR2DjmD6MY0Z3G+utdUkv18+jiF/DUe1cwEd74b5lhzSPcTy3ZMQ== 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 4Mg9wp068tzlYL; Sun, 2 Oct 2022 04:29:46 +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 2924TjNp058620; Sun, 2 Oct 2022 04:29:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2924TjNY058619; Sun, 2 Oct 2022 04:29:45 GMT (envelope-from git) Date: Sun, 2 Oct 2022 04:29:45 GMT Message-Id: <202210020429.2924TjNY058619@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: 753b13c64382 - stable/13 - sb_probe: eliminate write only variable r 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: 753b13c64382c20d4b02500e258f39db06b31cda Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684986; 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=ds5nkvdQBiEaHCM9KGV1dwizfJ/IysYpcyvhqYcNbqs=; b=xB6FWhQEQFVQpLyikELkfZg8jzUUb2EzjN5gBt15+aVzxMSobB7R8uBkhD664P3S3qtaQn IYoy0QcZ0SzF+YUU3nV+xLi23aMB+a5V9DVQWR3ePVPco+2e4e5A4ktjOYcorcCmaZsNXt fx3jnc0cRlEsG/vnWxjkC5C4n6qLkc0L0AouIr4ldooPCzDBolp8BXraT3uRlmvR7yKyEt BqcNIfnX1kzOx7vGbdsX7Y54cSfnJintPR+/SNaBuXDuLuJeroNQ1qtw70HGceOYpr5la8 Ec9EFQtXYrZcxTHS5RWXcbJZLlfBj06vD7vlPNnwa8ODmVBTRDoQ2IJfznNJWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664684986; a=rsa-sha256; cv=none; b=dNNGs9dBar/7xEH1nDahDn3hDhuSVDP8Tqc3UgS8lE4bY8oqza4twvnC25miKpirZWeV79 a+mWpbs1ylz605iMY0SSlwN2Nxbg5aXiDMV7o5xCz/bwwYYxICTFioELf8/EWzNRuBE3iw Au8f37flXq8y5Zpm+1qN4+X8uWhBZICiUF0LCHX7Qd+OenQn0dBU0kQaSYhrNSbL32aHc6 HbCd6Uy4J+hqH5EKaclj2IbwXybbMm2rTlYMgbPpZBE1vvIf+NJOODd99uJ42bkDjIg/mx gsreLBV6LvUfuNO1eK1EJdKz4tI2x2tOuc37zdWEqcA4KjApGBLaa5pFF9taqg== 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=753b13c64382c20d4b02500e258f39db06b31cda commit 753b13c64382c20d4b02500e258f39db06b31cda Author: Warner Losh AuthorDate: 2022-07-08 17:53:32 +0000 Commit: Warner Losh CommitDate: 2022-10-02 04:25:54 +0000 sb_probe: eliminate write only variable r Sponsored by: Netflix (cherry picked from commit 635a4068d2c5a711cf6cf35d6c9be8e550b5a5d9) --- sys/dev/sound/isa/sb8.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c index b45358c6c29c..b4e9d98232ba 100644 --- a/sys/dev/sound/isa/sb8.c +++ b/sys/dev/sound/isa/sb8.c @@ -691,14 +691,14 @@ static int sb_probe(device_t dev) { char buf[64]; - 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; ver &= 0x0000ffff; if ((f & BD_F_ESS) || (ver >= 0x400))