From nobody Fri Apr  8 00:03:49 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 825C51A88466;
	Fri,  8 Apr 2022 00:03: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 4KZJPf3hzgz4lBv;
	Fri,  8 Apr 2022 00:03:50 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1649376230;
	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=tWazf6nZ4xGZ61DUdO76Bz2NTskgTWUEOL1MdJMkt5g=;
	b=PgIb8TkiG8KZDiIEhxwqdRz/3tlh8RgQAI84Y5wkLnVROGmip5dJYkzoC2MOTMsRlvWulA
	x7MLA9LH2XCbQMpyiBn7GO4Q81BMRBp0ZkYEvs/3OqnLVPHr3oKh5hXDIV7+U9PzNy9pEW
	/dAofXSQWLRfVMAZwJlka4bDm+ehie3G1Rj08P4sroinHvteblnLzL1PtqP8YJQnitPs1M
	R4A26luF2uaijbX0E3R17zYQLVNt9qvgrvU5+i5dIozen6eMYWJ66bT6OOQ8wP6tAwEL8O
	tszo4y5y9F3tbEBQ30X39LwMYJgHnhm5iCOQj4cXmi57rGuRcmWqVx/+buO2dQ==
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 15D711A49D;
	Fri,  8 Apr 2022 00:03: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 23803nCW086870;
	Fri, 8 Apr 2022 00:03:49 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23803nv1086869;
	Fri, 8 Apr 2022 00:03:49 GMT
	(envelope-from git)
Date: Fri, 8 Apr 2022 00:03:49 GMT
Message-Id: <202204080003.23803nv1086869@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-main@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Subject: git: 92e7c96648b3 - main - pcm envy24: Remove some dead code and associated unused variables.
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
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: 92e7c96648b3d7226be137384710ab4b27a51be9
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1649376230;
	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=tWazf6nZ4xGZ61DUdO76Bz2NTskgTWUEOL1MdJMkt5g=;
	b=XXzI4SFC/lc/sqlYGfrP7rmWwbDuGKjJkzSuF5D1IszrHPUY975ujQ6US3IPbxHLCe+qrO
	lh9+1dNRjWadpdu6kdkroXbRspvCbM1YuoFqi+TZXd9TdsVsUaVUj4Iorzjp3WziMjZd6+
	zHEATxT1hzEkW5Pwn2YCX3DDQjFJAjG8FbzH299Z7UFYx2dsAgSwOwws1r7Nscij5Y+eps
	VHznRvFclPojhWBpzEi+tlTphbmhDt4rizMKgm2wL+ippo/cKfd/CgsBv5MtxB9bvLkpCi
	e6GkyQZkR5B8FFgQSaHVY+9HWuOJRhc5dpfJwcCDsgwk/ExEbcM/ColpO14dcQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649376230; a=rsa-sha256; cv=none;
	b=Voa41c4AoSUCZhsP6bTZPCqi4MTRzq1DXnuBQVKcAXiSM+d0Av2LqZ81izpozTl9lOEEbS
	AzWWKT7rI3wcYKQHFB4RE7DOF/9g1CIg+KF2uR8Z1i4NaSAEdi7iu2HkOiaBF/HTyh40P0
	eiXSSUOrHV4KgeS2c0D+zkSXAcY8NDdTXFY8VUObqOFOOY2hVADlAIQqL09pWvQirrp5FW
	Nj+KrmKrcFp/xny94vtMODkUk2TUD4MeVtOyTgrNAGPYK5JZxT7rvLGNCCbk3tu9BpOZ3R
	qT2cqovTn21IFeh7uXVIW+6s0LIrV0/Hxryx9kiDYtoMv3y6ISK7EtWmJlJvXw==
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=92e7c96648b3d7226be137384710ab4b27a51be9

commit 92e7c96648b3d7226be137384710ab4b27a51be9
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-04-08 00:01:29 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-04-08 00:01:29 +0000

    pcm envy24: Remove some dead code and associated unused variables.
    
    The dead code was commented out in the initial import and hasn't
    changed since.
---
 sys/dev/sound/pci/envy24.c   | 16 +++-------------
 sys/dev/sound/pci/envy24ht.c | 16 +++-------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c
index 36f453bd9252..7c1ba58b5708 100644
--- a/sys/dev/sound/pci/envy24.c
+++ b/sys/dev/sound/pci/envy24.c
@@ -1202,9 +1202,9 @@ envy24_gethwptr(struct sc_info *sc, int dir)
 static void
 envy24_updintr(struct sc_info *sc, int dir)
 {
-	int regptr, regintr;
+	int regintr;
 	u_int32_t mask, intr;
-	u_int32_t ptr, size, cnt;
+	u_int32_t cnt;
 	u_int16_t blk;
 
 #if(0)
@@ -1212,28 +1212,18 @@ envy24_updintr(struct sc_info *sc, int dir)
 #endif
 	if (dir == PCMDIR_PLAY) {
 		blk = sc->blk[0];
-		size = sc->psize / 4;
-		regptr = ENVY24_MT_PCNT;
 		regintr = ENVY24_MT_PTERM;
 		mask = ~ENVY24_MT_INT_PMASK;
 	}
 	else {
 		blk = sc->blk[1];
-		size = sc->rsize / 4;
-		regptr = ENVY24_MT_RCNT;
 		regintr = ENVY24_MT_RTERM;
 		mask = ~ENVY24_MT_INT_RMASK;
 	}
 
-	ptr = size - envy24_rdmt(sc, regptr, 2) - 1;
-	/*
-	cnt = blk - ptr % blk - 1;
-	if (cnt == 0)
-		cnt = blk - 1;
-	*/
 	cnt = blk - 1;
 #if(0)
-	device_printf(sc->dev, "envy24_updintr():ptr = %d, blk = %d, cnt = %d\n", ptr, blk, cnt);
+	device_printf(sc->dev, "envy24_updintr():blk = %d, cnt = %d\n", blk, cnt);
 #endif
 	envy24_wrmt(sc, regintr, cnt, 2);
 	intr = envy24_rdmt(sc, ENVY24_MT_INT, 1);
diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c
index d794fe605967..608afe33ca9f 100644
--- a/sys/dev/sound/pci/envy24ht.c
+++ b/sys/dev/sound/pci/envy24ht.c
@@ -1156,9 +1156,9 @@ envy24ht_gethwptr(struct sc_info *sc, int dir)
 static void
 envy24ht_updintr(struct sc_info *sc, int dir)
 {
-	int regptr, regintr;
+	int regintr;
 	u_int32_t mask, intr;
-	u_int32_t ptr, size, cnt;
+	u_int32_t cnt;
 	u_int16_t blk;
 
 #if(0)
@@ -1166,28 +1166,18 @@ envy24ht_updintr(struct sc_info *sc, int dir)
 #endif
 	if (dir == PCMDIR_PLAY) {
 		blk = sc->blk[0];
-		size = sc->psize / 4;
-		regptr = ENVY24HT_MT_PCNT;
 		regintr = ENVY24HT_MT_PTERM;
 		mask = ~ENVY24HT_MT_INT_PMASK;
 	}
 	else {
 		blk = sc->blk[1];
-		size = sc->rsize / 4;
-		regptr = ENVY24HT_MT_RCNT;
 		regintr = ENVY24HT_MT_RTERM;
 		mask = ~ENVY24HT_MT_INT_RMASK;
 	}
 
-	ptr = size - envy24ht_rdmt(sc, regptr, 2) - 1;
-	/*
-	cnt = blk - ptr % blk - 1;
-	if (cnt == 0)
-		cnt = blk - 1;
-	*/
 	cnt = blk - 1;
 #if(0)
-	device_printf(sc->dev, "envy24ht_updintr():ptr = %d, blk = %d, cnt = %d\n", ptr, blk, cnt);
+	device_printf(sc->dev, "envy24ht_updintr():blk = %d, cnt = %d\n", blk, cnt);
 #endif
 	envy24ht_wrmt(sc, regintr, cnt, 2);
 	intr = envy24ht_rdmt(sc, ENVY24HT_MT_INT_MASK, 1);