aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2017-04-05 07:07:24 -0400
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2017-04-24 17:27:18 -0400
commit3b395d67d9d6c20d142f6a1618c44577d3d79347 (patch)
treeccc59a84c6dfd3b4fa7d5b4be3627e7e9200f2ad
parentf65cc104c498ad820efb13e3a24fe36af872f17a (diff)
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>
-rw-r--r--drivers/char/tpm/tpm_crb.c3
-rw-r--r--include/acpi/actbl2.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index 72b03c328198..b917b9d5f710 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)
572 ACPI_TPM2_COMMAND_BUFFER_WITH_SMC); 572 ACPI_TPM2_COMMAND_BUFFER_WITH_SMC);
573 return -EINVAL; 573 return -EINVAL;
574 } 574 }
575 crb_smc = ACPI_ADD_PTR(struct tpm2_crb_smc, buf, 575 crb_smc = ACPI_ADD_PTR(struct tpm2_crb_smc, buf, sizeof(*buf));
576 ACPI_TPM2_START_METHOD_PARAMETER_OFFSET);
577 priv->smc_func_id = crb_smc->smc_func_id; 576 priv->smc_func_id = crb_smc->smc_func_id;
578 priv->flags |= CRB_FL_CRB_SMC_START; 577 priv->flags |= CRB_FL_CRB_SMC_START;
579 } 578 }
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 2b4af0769a28..0ff3c64ce924 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -1296,8 +1296,6 @@ struct acpi_table_tpm2 {
1296#define ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD 8 1296#define ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD 8
1297#define ACPI_TPM2_COMMAND_BUFFER_WITH_SMC 11 1297#define ACPI_TPM2_COMMAND_BUFFER_WITH_SMC 11
1298 1298
1299#define ACPI_TPM2_START_METHOD_PARAMETER_OFFSET 52
1300
1301/******************************************************************************* 1299/*******************************************************************************
1302 * 1300 *
1303 * UEFI - UEFI Boot optimization Table 1301 * UEFI - UEFI Boot optimization Table