From nobody Sun Oct 02 04:29:50 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 4Mg9wv29dlz4dt1b; Sun, 2 Oct 2022 04:29:51 +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 4Mg9wt4jwTz45yM; Sun, 2 Oct 2022 04:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684990; 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=thGAT2w4B7YZu+1JZCjPG9aZuNRw+FGKxfU8qFiGg3o=; b=KMdLrwbkKkx1cTdjBiwYYyexKtg3kX7KMRLClmSldqS30xKo2yp4xhEBmFSoCRiM86BFFj v//C7eQe3/UKdAExo+BqTnLbwfI1VY1oAzHrLiftaj+AwhWbRnknod7JGjJ0FWn4la3lHm YNVJaST0FWbsWIyorQ0/IN35z3P9wc+Pia2RbwPAg6LLohOrf2YucZu2DSt2O4L209erJv 9ma5FMGS4hUJZV2LZd1k7s5EFjk/0PPr9hx6GsCZEm7NTbCd7R52hut9ddW/102YGzL9gF FucxLoCRiVM3eRxvlp04hQE4kJgkQdoX5rkC/CZQNvvy9YGhYKqk6wfRCEa34A== 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 4Mg9wt3qCvzlbp; Sun, 2 Oct 2022 04:29:50 +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 2924To6l058723; Sun, 2 Oct 2022 04:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2924To8S058722; Sun, 2 Oct 2022 04:29:50 GMT (envelope-from git) Date: Sun, 2 Oct 2022 04:29:50 GMT Message-Id: <202210020429.2924To8S058722@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: 62ec1f05fa9e - stable/13 - emu_midi_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: 62ec1f05fa9ee1b57db585fda7548a60ce99c1ee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684990; 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=thGAT2w4B7YZu+1JZCjPG9aZuNRw+FGKxfU8qFiGg3o=; b=PUIZOwzPw7U57DHktYXIGGRmuED+YQp3gML87o5v6QSdPjRzp2CXvMeDW3f2z54dKt98RQ GWME4vMzsYQo20VDckD4LR3YqkSPiByxFLxsxV45y/aQDfCcOXskpAZyPzuojJxWI1G8ry wTZphspwP5bXU6hnOiM87tVlA6F7iVMoZqI8OExKLwogl6czpg/tIdspYpz2SzOTowVhZI giRq47G04GccEhmgEi3eQau7TzoE2LSQcYP9oEAWf7PhqiupvqZvBaYPwQ3JGvWZDb6SUA miIYSzjoFcHTpW48R4d2oz5J7xKsdl9c5/21xiqpXL2mkic6/1SdTSpbAjJ4Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664684990; a=rsa-sha256; cv=none; b=MtW5IRrstPXLfrPXNsXAJl31l+ggBQabnpq/yqtXcnC3QAMXwGsFIJhaAaw0v+wlSrdmfK 5dWfEmEVKGg/BuJtOTBwSrfF7yHYnLVR0c+gNC9CxPEluIdYzcPSlUKQkh7OLxFlwgvElv XW4buF/veZzy2pTXisjg3fH6JLvzxhWSwrazlpzhpKO8pt4QkEuzdEBEVzz0xvy+9uKVeD rmmRnccEGJn9+lqTrpmmzMmjui2NoGfRxI783vUMv6V4Fi/rbuUXVvEkyq2qvaw6pNEOZS rKijC3llex6eycDYNbPMxqszQJCeDmCDUKRgQv38Nt+EBmJmYja+1KNGwb9OFA== 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=62ec1f05fa9ee1b57db585fda7548a60ce99c1ee commit 62ec1f05fa9ee1b57db585fda7548a60ce99c1ee Author: Warner Losh AuthorDate: 2022-07-08 17:53:32 +0000 Commit: Warner Losh CommitDate: 2022-10-02 04:25:54 +0000 emu_midi_probe: eliminate write only variable r Sponsored by: Netflix (cherry picked from commit 7387abd342a181bcf278949e22f09ebc25ed00ae) --- sys/dev/sound/pci/emu10kx-midi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pci/emu10kx-midi.c b/sys/dev/sound/pci/emu10kx-midi.c index e00a850a66e2..a458b6993c08 100644 --- a/sys/dev/sound/pci/emu10kx-midi.c +++ b/sys/dev/sound/pci/emu10kx-midi.c @@ -142,15 +142,15 @@ static int emu_midi_probe(device_t dev) { struct emu_midi_softc *scp; - uintptr_t func, r, is_emu10k1; + uintptr_t func, is_emu10k1; - r = BUS_READ_IVAR(device_get_parent(dev), dev, 0, &func); + BUS_READ_IVAR(device_get_parent(dev), dev, 0, &func); if (func != SCF_MIDI) return (ENXIO); scp = device_get_softc(dev); bzero(scp, sizeof(*scp)); - r = BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_ISEMU10K1, &is_emu10k1); + BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_ISEMU10K1, &is_emu10k1); scp->is_emu10k1 = is_emu10k1 ? 1 : 0; device_set_desc(dev, "EMU10Kx MIDI Interface");