From nobody Sun Oct 02 04:29:44 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 4Mg9wn1XTpz4dtB3; Sun, 2 Oct 2022 04:29:45 +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 4Mg9wn0bdDz45W1; Sun, 2 Oct 2022 04:29:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684985; 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=oZYYNfDITmEb3CbUjMCaYdW8LzocDfvN9E9xtcLEDMM=; b=AOClfIYMNC/5Tj9Ch2b0IcT7xVK0jEkUFlvHLZUZGzLpoDcM9G4oow1H8Bafc6XUnezaI9 bQS61n4Jeb2aR0R/Cjl6juDmX0BhsQjSMyX82zedheEQOiY0HoEROGskIW8PfT7TwSirYf 6hlqMnPIPMx0RsWEX1PlyQIybnOAF05YaifjGqxjwRHOINOpbwxtsbLCNja09tWxXfQpv5 0GllDLHTE18Myc7JH5jeodBGMz1vD+cmzTnq8uQv/S2RZUbJoX37Gry+H+AucTNP76KAdx YkOIJS1rnymxYZDkjKqftXpviOQjAzr3gcqa5J07wFI9UXxaIFPR+qdQc1fEPw== 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 4Mg9wm6ZYhzlTb; Sun, 2 Oct 2022 04:29:44 +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 2924Tivu058595; Sun, 2 Oct 2022 04:29:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2924TiqC058594; Sun, 2 Oct 2022 04:29:44 GMT (envelope-from git) Date: Sun, 2 Oct 2022 04:29:44 GMT Message-Id: <202210020429.2924TiqC058594@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: 6b31f08b47ee - stable/13 - sb16_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: 6b31f08b47eeed28eeb2af3efe6d21208740901c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684985; 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=oZYYNfDITmEb3CbUjMCaYdW8LzocDfvN9E9xtcLEDMM=; b=i0sWm2McFOxRnPUf4972qACgIXP/zsYovI0pnz7kAowmmAZi/r240ttGfm8vWXytTViMPh WlEu4MnWofuyxUlUeYsIQV07SaOjsxfCKV8OWot8iC/toqFhkZLPWZ8kfE5fXVQiucjL3/ BtpUYDOS2Q9OzsTxNNsmzd4DwNkDKoPsx+FCgGUC6bLBMt6t/hnHE9+p1Nz+NVRIOXuwHR Hwt9FUNnlm/hLHniJFLaKvCxoxUShdgCXsCsWO0NqJKQaDkN0gF6VKa/L203CV1eBMZt1B bjjMX+9mt+wqp1gADPGe9isHodB1uqNq+4nDATBmuky13aEeh8ak2K377krUVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664684985; a=rsa-sha256; cv=none; b=NW84/OvPArXLMo9ySb9lPQn8U6FEgrgmZBTFfyEKsZxZTvwqyIEW/F7zlxyuWKsgSwuDB9 uXzYoujIdbYkWV0RYlSovooP15yUzUpr/Cc7mfk0mmj9mDyVKz3KzSDRHpQ42Fz5/7UIWW WVqgfu8CEP82/vq9Wc1wtnJ0X2EP8Gdt0kTbIzvUEutEA6C2QtrJDX2YMN1YziWS7+/GRv f/tOv3W0tJKhpMwsVQczgF/4ELBqh1ZkYD1xHcRk8O/afNr6kXHklM49r8qF8CQyj4CDVz clsG7g0jK9tR8sj0GUsUkGbFkxZjfj1X0y7nfNr1pAkSUBHMx15yt0GGhawQTA== 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=6b31f08b47eeed28eeb2af3efe6d21208740901c commit 6b31f08b47eeed28eeb2af3efe6d21208740901c Author: Warner Losh AuthorDate: 2022-07-08 17:53:32 +0000 Commit: Warner Losh CommitDate: 2022-10-02 04:25:54 +0000 sb16_probe: eliminate write only variable r Sponsored by: Netflix (cherry picked from commit 668986eae9b5d7da35a27445c1f306604caa0429) --- sys/dev/sound/isa/sb16.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c index 50d7e89650e5..a956b8a6c595 100644 --- a/sys/dev/sound/isa/sb16.c +++ b/sys/dev/sound/isa/sb16.c @@ -788,14 +788,14 @@ static int sb16_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_SB16) {