tpm: drop tpm_atmel specific fields from tpm_vendor_specific

[cascardo/linux.git] / drivers / char / tpm / tpm.h

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 5fcf788..c5f8d9e 100644 (file)
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -34,7 +34,7 @@
 enum tpm_const {
        TPM_MINOR = 224,        /* officially assigned */
        TPM_BUFSIZE = 4096,
-       TPM_NUM_DEVICES = 256,
+       TPM_NUM_DEVICES = 65536,
        TPM_RETRY = 50,         /* 5 seconds */
 };
 
@@ -136,9 +136,6 @@ struct tpm_vendor_specific {
 
        int irq;
 
-       int region_size;
-       int have_region;
-
        struct list_head list;
        int locality;
        unsigned long timeout_a, timeout_b, timeout_c, timeout_d; /* jiffies */
@@ -148,7 +145,6 @@ struct tpm_vendor_specific {
        void *priv;
 
        wait_queue_head_t read_queue;
-       wait_queue_head_t int_queue;
 
        u16 manufacturer_id;
 };
@@ -195,8 +191,6 @@ struct tpm_chip {
        acpi_handle acpi_dev_handle;
        char ppi_version[TPM_PPI_VERSION_LEN + 1];
 #endif /* CONFIG_ACPI */
-
-       struct list_head list;
 };
 
 #define to_tpm_chip(d) container_of(d, struct tpm_chip, dev)
@@ -492,6 +486,7 @@ static inline void tpm_buf_append_u32(struct tpm_buf *buf, const u32 value)
 extern struct class *tpm_class;
 extern dev_t tpm_devt;
 extern const struct file_operations tpm_fops;
+extern struct idr dev_nums_idr;
 
 ssize_t        tpm_getcap(struct device *, __be32, cap_t *, const char *);
 ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,