summaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm/tpm.h
diff options
context:
space:
mode:
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2016-03-23 06:31:56 +0100
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2016-06-25 16:26:35 +0200
commitd4956524f1b0ae010c6d6cc1369a7fae63b52165 (patch)
treeb334414999711d6ca3fe90553998d58335b3f079 /drivers/char/tpm/tpm.h
parenttpm: drop tpm_atmel specific fields from tpm_vendor_specific (diff)
downloadlinux-d4956524f1b0ae010c6d6cc1369a7fae63b52165.tar.xz
linux-d4956524f1b0ae010c6d6cc1369a7fae63b52165.zip
tpm: drop manufacturer_id from struct tpm_vendor_specific
Dropped manufacturer_id from struct tpm_vendor_specific and redeclared it in the private struct priv_data that tpm_tis uses because the field is only used tpm_tis. Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Diffstat (limited to 'drivers/char/tpm/tpm.h')
-rw-r--r--drivers/char/tpm/tpm.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index c5f8d9e4f953..6586b6aac23f 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -145,8 +145,6 @@ struct tpm_vendor_specific {
void *priv;
wait_queue_head_t read_queue;
-
- u16 manufacturer_id;
};
#define TPM_VPRIV(c) ((c)->vendor.priv)