From nobody Sun Oct 2 04:29:51 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 4Mg9ww0KQsz4dtPj; Sun, 2 Oct 2022 04:29:52 +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 4Mg9wv5HVdz45nM; Sun, 2 Oct 2022 04:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684991; 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=R6ui0gi73C5uwTnbCRuGvWi1g62TCc3tgwLechS2zDA=; b=D+O9PZc/SAgYmA8HIEQeNk59K+aZNQkGucm/VMMT2YFytXLAr8Raesv08U1vD8Cu8Emm/l +3Dg70meDBc7oAlaAhrYYI/MYWIg7h19gbHd30QNvwzfNgxqxmpuc5oZQQEG3RvSJ2xtIX nYk9LMLHjonLGYiP6QTOsCCz0Y7P72DwdvfFl/n2CJTHkjQulOjFiWDJ5aG51MzRkHKn4V GogNPG6Sg/Tb7tKu9nwSGl7PgoDZ9On10O3aQ6ODe0ZRkL41p9c40HQBhuAG1gP+dCFDhS ghEdRqhxcZjZ3fNLyVeltJYorwTb8A1mZxqXSXNUf/IjsrnwjaI2XsFHH7hsog== 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 4Mg9wv49xqzlf8; Sun, 2 Oct 2022 04:29:51 +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 2924TpJ0058748; Sun, 2 Oct 2022 04:29:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2924TpnJ058747; Sun, 2 Oct 2022 04:29:51 GMT (envelope-from git) Date: Sun, 2 Oct 2022 04:29:51 GMT Message-Id: <202210020429.2924TpnJ058747@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: 30711541bac9 - stable/13 - emu10kx-pci: 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: 30711541bac93e8dc64b87ed65fcb7b9b1e80691 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684991; 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=R6ui0gi73C5uwTnbCRuGvWi1g62TCc3tgwLechS2zDA=; b=r/IuNF6cqRv9QPbDTHFPDrhRuaLYN+kcp8yoUna+4vE++2y8cmFS8sF31ZX2QqpaE9lGqs 576RK0vWHht2vO/2Hi3Atwz409+/ghpcdlPRAHo//nbSm4kA4UfkLTDKJbBtcP3MUFwfgm PZWPWXoT1Jy4PEoYSzMBbS0rDN61d2bgjMt3O5SbZ6fcoQfhXmk8+LxIGwnN5ODzQBUf0x Z1BA5DncQfEq1X22hmaMv3KWnFSFa1KzTIcuwQ2nUkS56GBiBfzlHsb+g7VJ6kZMgxjFEX 4cSdXvQgTaE7CVVPFT34GF+R7cu23E2w0ABCAsTPT7CIZFNnY5/fXIwxhu+UVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664684991; a=rsa-sha256; cv=none; b=lj9823wHUxDR1oLgLxlt3DQcRq1U7Rl1Pw2APL6wH84iUlhlDaa1Kwh4ZaBolLrJLBtfib Z5DB4Sz8ebXvJRiXYIvy21kGvPbdP5fyPHbOqjdxMyiYr3mnhk9vb8XIxvfCZjHjT46Kff 1A8sAtXgh4Pjb82X61JPNc37qNw2AdKxnbSKLpBetX67YJeeqIYdwEKjrcD9iD4j0hqE4i IFgQ5RYlb+1DWx/WzPayH1Y974zrvjKnAGPfza9AwNZ5Qe4MTmUOoRir5el770h4rGnirs vwRzWBgV3fT8/LSaOgZ9ZmG0JVv2Qu3SQapchTWIo6hZfkcmXteWSHp90d7M5w== 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=30711541bac93e8dc64b87ed65fcb7b9b1e80691 commit 30711541bac93e8dc64b87ed65fcb7b9b1e80691 Author: Warner Losh AuthorDate: 2022-07-08 17:53:32 +0000 Commit: Warner Losh CommitDate: 2022-10-02 04:25:55 +0000 emu10kx-pci: eliminate write only variable r Sponsored by: Netflix (cherry picked from commit 451f54707a614757e2a0093876e30b68247a41da) --- sys/dev/sound/pci/emu10kx-pcm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c index 4f50ffd1f74f..5f66799ab902 100644 --- a/sys/dev/sound/pci/emu10kx-pcm.c +++ b/sys/dev/sound/pci/emu10kx-pcm.c @@ -1298,17 +1298,17 @@ emu_pcm_uninit(struct emu_pcm_info *sc __unused) static int emu_pcm_probe(device_t dev) { - uintptr_t func, route, r; + uintptr_t func, route; const char *rt; char buffer[255]; - r = BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_FUNC, &func); + BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_FUNC, &func); if (func != SCF_PCM) return (ENXIO); rt = "UNKNOWN"; - r = BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_ROUTE, &route); + BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_ROUTE, &route); switch (route) { case RT_FRONT: rt = "front"; @@ -1342,7 +1342,7 @@ emu_pcm_attach(device_t dev) unsigned int i; char status[SND_STATUSLEN]; uint32_t inte, ipr; - uintptr_t route, r, ivar; + uintptr_t route, ivar; sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); sc->card = (struct emu_sc_info *)(device_get_softc(device_get_parent(dev))); @@ -1355,10 +1355,10 @@ emu_pcm_attach(device_t dev) sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_emu10kx pcm softc"); sc->dev = dev; - r = BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_ISEMU10K1, &ivar); + BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_ISEMU10K1, &ivar); sc->is_emu10k1 = ivar ? 1 : 0; - r = BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_MCH_DISABLED, &ivar); + BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_MCH_DISABLED, &ivar); sc->mch_disabled = ivar ? 1 : 0; sc->codec = NULL; @@ -1381,7 +1381,7 @@ emu_pcm_attach(device_t dev) sc->emu10k1_volcache[1][0] = 75; sc->emu10k1_volcache[0][1] = 75; sc->emu10k1_volcache[1][1] = 75; - r = BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_ROUTE, &route); + BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_ROUTE, &route); sc->route = route; switch (route) { case RT_FRONT: