From nobody Fri Apr 08 00:03:47 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 C17391A88617; Fri, 8 Apr 2022 00:03:48 +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 4KZJPc14ZNz4l5v; Fri, 8 Apr 2022 00:03:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376228; 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=7iyPe+F59STJESeTSp2t0YwbvHsJHl0WoMt8Uy6MQJw=; b=MKnZusXhN0bAYJurbmf7iOdGEi2TjvZ5GM0j6dyYY1/S5dM3RacacfDiyPeJCx2Gh5p1QQ swjcN2bxWffSExOLaG3AqFeHehX3Q7LfPF2/gsS7K4+iZ6qdQaTLWbQWJmeRw71aEVrNGH Dh9Keg53oyPtKzZMomjbSDPQTVbUYgoXPNoFnj7oqa9onVpU2nDXjfGjAbZgMnJ63VLu0R JMrze33RqsBGMJ74MfbiouK2AzJeX3ES4efUdMGCKfxVbHI5mZbKNoQc9VLwHSgL+PXUBM lPsv4/vIW4l0OB3fZxOmGzQu+03e5OJTcaHPqNcW45dToP6no+cD5+cqnpLUMw== 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 B1B771A504; Fri, 8 Apr 2022 00:03:47 +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 23803lFT086816; Fri, 8 Apr 2022 00:03:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23803l6N086815; Fri, 8 Apr 2022 00:03:47 GMT (envelope-from git) Date: Fri, 8 Apr 2022 00:03:47 GMT Message-Id: <202204080003.23803l6N086815@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3e4aa9c629af - main - pcm atiixp: Remove dead variable. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e4aa9c629af0e5bd44fffc93cb7a2fc4230e988 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376228; 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=7iyPe+F59STJESeTSp2t0YwbvHsJHl0WoMt8Uy6MQJw=; b=NVa1K7ugE1KG5WulDS/3bck3fuuCUkHcyYd51t3E4LmZDIlCn6WDu8lMLwoEEWZS+rcsrh zReqMgB2Z6qqq0lzy8EQzNzF3X+EKD9D7UPE3nojmovdjDvlXlD00GqWZLHnaCSIfdY1aD RxubC3irbUYK4DRsnoDeIYttRTrrgfqNLcr3dcxCT+cSLFTWcbOM1w+ggt2c7IsLhUwWU2 XPrKnD6Miv+ukxUycq2qsSyH6tw1i39VcCd9r82u1uDrctpnz2Ui3vcC+wDEy9w1fYB8pJ AXfLvFFQLmZWtiPSwNb/h1JD6SYdxHTvv9akiumtGdjelnhHLq1wP+rrTk6p7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649376228; a=rsa-sha256; cv=none; b=ahHYYJQ6bRbXJe/ienpt2qnJaJ56p3HAQDoU2kPofPgNvq9YtXPp+zmi/JqDewjyUCBoEd Y3Z/cozHGczBj9kmOTDdi9Y7ykT1pSJF3CstNyvSxS+Y+sOPWTCw0QZmOxeg8cK7YF+ZtP onskbd645LpyJZ4vzI7nDt0qpBvUBFitcad02JH9a8TgOJNHCWLpOWY0MoQ0Ml8TR5WAst qlq6bNLld7chBzxpFs2MwAzmC9ucBIFuFq7Nmsl9+RVTY3e970SNDKGAQhqleji7KkSl4s G7MkETYjMMj3H5nO7UuCQFtTiEOFW/r/BPhJKT4lLy2TXUiUumD9vEQLP+mhvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3e4aa9c629af0e5bd44fffc93cb7a2fc4230e988 commit 3e4aa9c629af0e5bd44fffc93cb7a2fc4230e988 Author: John Baldwin AuthorDate: 2022-04-08 00:01:28 +0000 Commit: John Baldwin CommitDate: 2022-04-08 00:01:28 +0000 pcm atiixp: Remove dead variable. The Linux driver clears ATI_REG_CMD_AC_RESET and sets ATI_REG_CMD_POWERDOWN, so writing the calculated value that sets both would seem to be wrong. This could be updated to match Linux's behavior, but instead I've just left it as-is. --- sys/dev/sound/pci/atiixp.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index 21e8350b691e..ff676b97ebed 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -1333,7 +1333,6 @@ static int atiixp_pci_suspend(device_t dev) { struct atiixp_info *sc = pcm_getdevinfo(dev); - uint32_t value; /* quickly disable interrupts and save channels active state */ atiixp_lock(sc); @@ -1352,8 +1351,6 @@ atiixp_pci_suspend(device_t dev) /* power down aclink and pci bus */ atiixp_lock(sc); - value = atiixp_rd(sc, ATI_REG_CMD); - value |= ATI_REG_CMD_POWERDOWN | ATI_REG_CMD_AC_RESET; atiixp_wr(sc, ATI_REG_CMD, ATI_REG_CMD_POWERDOWN); atiixp_unlock(sc);