From 3b395d67d9d6c20d142f6a1618c44577d3d79347 Mon Sep 17 00:00:00 2001
From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date: Wed, 5 Apr 2017 14:07:24 +0300
Subject: [PATCH] tpm_crb: remove a cruft constant
Remove a useless constant that slipped through me when I did the code
review. This commit fixes the issue.
Cc: Jiandi An <anjiandi@codeaurora.org>
Fixes: 69c558de63c7 ("tpm/tpm_crb: Enable TPM CRB interface for ARM64")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
drivers/char/tpm/tpm_crb.c | 3 +--
include/acpi/actbl2.h | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index 72b03c3281986..b917b9d5f7102 100644
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -572,8 +572,7 @@ static int crb_acpi_add(struct acpi_device *device)
ACPI_TPM2_COMMAND_BUFFER_WITH_SMC);
return -EINVAL;
}
- crb_smc = ACPI_ADD_PTR(struct tpm2_crb_smc, buf,
- ACPI_TPM2_START_METHOD_PARAMETER_OFFSET);
+ crb_smc = ACPI_ADD_PTR(struct tpm2_crb_smc, buf, sizeof(*buf));
priv->smc_func_id = crb_smc->smc_func_id;
priv->flags |= CRB_FL_CRB_SMC_START;
}
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 2b4af0769a289..0ff3c64ce9245 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -1296,8 +1296,6 @@ struct acpi_table_tpm2 {
#define ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD 8
#define ACPI_TPM2_COMMAND_BUFFER_WITH_SMC 11
-#define ACPI_TPM2_START_METHOD_PARAMETER_OFFSET 52
-
/*******************************************************************************
*
* UEFI - UEFI Boot optimization Table