From owner-dev-commits-src-branches@freebsd.org Thu Mar 4 15:14:09 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 47D7A54E4C7;
Thu, 4 Mar 2021 15:14:09 +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 4DrvXc45jwz3vvQ;
Thu, 4 Mar 2021 15:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 5DCFF1F52B;
Thu, 4 Mar 2021 15:14:08 +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 124FE8FQ058953;
Thu, 4 Mar 2021 15:14:08 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 124FE85f058952;
Thu, 4 Mar 2021 15:14:08 GMT (envelope-from git)
Date: Thu, 4 Mar 2021 15:14:08 GMT
Message-Id: <202103041514.124FE85f058952@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Motin <mav@FreeBSD.org>
Subject: git: 40c0c3ef1f7d - stable/12 - amdtemp(4): Remove dead code that
snuck in with r357190
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mav
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 40c0c3ef1f7d1b932e8c22e0a62d2336a4f898e9
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Mar 2021 15:14:15 -0000
The branch stable/12 has been updated by mav:
URL: https://cgit.FreeBSD.org/src/commit/?id=40c0c3ef1f7d1b932e8c22e0a62d2336a4f898e9
commit 40c0c3ef1f7d1b932e8c22e0a62d2336a4f898e9
Author: Conrad Meyer <cem@FreeBSD.org>
AuthorDate: 2020-01-28 03:27:06 +0000
Commit: Alexander Motin <mav@FreeBSD.org>
CommitDate: 2021-03-04 15:09:18 +0000
amdtemp(4): Remove dead code that snuck in with r357190
I intended to remove this before committing, but neglected to.
(cherry picked from commit cc3b01385bfd7e7f67866c4ac0a1b43370d7e6b7)
---
sys/dev/amdtemp/amdtemp.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c
index 8eb279c19cb8..38be7d9bd1b5 100644
--- a/sys/dev/amdtemp/amdtemp.c
+++ b/sys/dev/amdtemp/amdtemp.c
@@ -760,11 +760,6 @@ amdtemp_gettemp17h(device_t dev, amdsensor_t sensor)
("sensor %d: not valid", (int)sensor));
return (amdtemp_decode_fam10h_to_17h(sc->sc_offset, val, true));
default:
-#if 0
- KASSERT(false, ("%s: invalid sensor %d", __func__,
- (int)sensor));
- return (-1);
-#endif
__unreachable();
}
}