From nobody Fri Apr 08 00:03:55 2022 X-Original-To: dev-commits-src-main@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 D58F01A889C4; Fri, 8 Apr 2022 00:03:56 +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 4KZJPm1yDRz4l8X; Fri, 8 Apr 2022 00:03:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376236; 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=PrK6bgm8VuIQmEUcrYgqqKYY2YknoBN84tka9pqkfJc=; b=mwuyANleLG9GrTokBPsddSNrbSitW0yrZFIzBzEDgrP5SeGdhw26KGldQ2tt7ic2j9df6D IlYp3THScN+CX8513mtf3/YAK3VyzYM2cjLIqeXbWj2435I5nz+Ab7PAsOEvJX5TtGhq4L zlqvRaV72e25bRcr7cjznFmoXiG3adXZvhxd2wJthkG6DvRdBhnWEEe25jDk/XYGFJS/Qp thrT7FlEdoXdjSGEfBpxK9Lo6l2ytDLO/TXwjC3OLLeW11gSYR1IpgnRMuK5ijT2b6UjL0 SKgdxqBY9stZbUgPDkWFeEzusYbr1Cm3X/DOkeJ25UOyMPA6sVfMjfaH7iQmxw== 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 D9E321A585; Fri, 8 Apr 2022 00:03:55 +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 23803tAt086998; Fri, 8 Apr 2022 00:03:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23803t5F086997; Fri, 8 Apr 2022 00:03:55 GMT (envelope-from git) Date: Fri, 8 Apr 2022 00:03:55 GMT Message-Id: <202204080003.23803t5F086997@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: 08ff11e52423 - main - tpm: Remove unused variables. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 08ff11e524230bf9bf4c2adfd8f094af64c5f956 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376236; 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=PrK6bgm8VuIQmEUcrYgqqKYY2YknoBN84tka9pqkfJc=; b=lpNg6/gKKD+PCMcw80vcma0L5K/gVqd9eZYCdDxWBMNZp1dAZy6QmPPYV6mQ+53bqSUBht OxZ5K8hEtO2ImdLf0QpnQi4z0WN3G2cSnjRDQeVYSF9NFB9lEXbaaYXdzDV3nxhM2EejlB ublvWUa3OiNtaUT1aMuwzLykuGQuMdU56AuyDT7uVFLm+5HBmG0RowglzvRdBuGDl68keR 2LHcGmmSm4WPmS5AS/q9A1gVccoj35Kj5p2+WD9PPukjYV3p8DeTMuT+SebLcS4IIRmySz L32DP/NhPobVQ+p3UsLv4A9P4P5lJDgtMB7Bkv7m2GuW/9PnbhKbDXy+1NtCaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649376236; a=rsa-sha256; cv=none; b=PN28/+IYU+hmGYpJq0UpfermHNIU/Vurupz0gGUy/umfkzgApmMTu86QggwsEWiZwILQik GLu1kloS+i/FzMx1lBRFVEcR+LjRrBzLsEwnAaHwbIOv8XIzN8S6vDIMJPlJqu6wPH5L1z XgrGWXwAz7XJkbqnavQoU87joBg1dT5Oaq/rHsy4xs7tkoWIY0AzloKElLEnRSXj+NzNqU MVrz60IA7/KHgkvcAzUokh26SAkFKBTeM7k8/9Voq7uVcCkfC5+/7JQAzW6Om6RY2YxqW8 nN83AlccNvsZTmBOQJxgQVMVwMO6LDKVHDuSaMqstFKxOaEkJnN8QvU0MjoCoA== 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=08ff11e524230bf9bf4c2adfd8f094af64c5f956 commit 08ff11e524230bf9bf4c2adfd8f094af64c5f956 Author: John Baldwin AuthorDate: 2022-04-08 00:01:29 +0000 Commit: John Baldwin CommitDate: 2022-04-08 00:01:29 +0000 tpm: Remove unused variables. All of the legacy config stuff in tpm seems broken. Nothing ever sets tpm_enabled to a non-zero value and the legacy bits expect tpm_enabled to be set to the base IO port address (I think). --- sys/dev/tpm/tpm.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/dev/tpm/tpm.c b/sys/dev/tpm/tpm.c index 21d68012aded..0a041fa96114 100644 --- a/sys/dev/tpm/tpm.c +++ b/sys/dev/tpm/tpm.c @@ -1018,7 +1018,6 @@ int tpm_legacy_init(struct tpm_softc *sc, int irq, const char *name) { char id[8]; - u_int8_t ioh, iol; int i; if ((i = bus_space_map(sc->sc_batm, tpm_enabled, 2, 0, &sc->sc_bahm))) { @@ -1031,8 +1030,6 @@ tpm_legacy_init(struct tpm_softc *sc, int irq, const char *name) id[i] = tpm_legacy_in(sc->sc_bt, sc->sc_bh, TPM_ID + i); printf(": %.4s %d.%d @0x%x\n", &id[4], id[0], id[1], tpm_enabled); - iol = tpm_enabled & 0xff; - ioh = tpm_enabled >> 16; tpm_enabled = 0; return 0;