tpm: tpm_tis_i2c: Drop struct tpm_vendor_specific
This function is misnamed since it only applies to a single driver. Merge
its fields into its parent.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>
diff --git a/drivers/tpm/tpm_tis_i2c.h b/drivers/tpm/tpm_tis_i2c.h
index 426c519..2a4ad77 100644
--- a/drivers/tpm/tpm_tis_i2c.h
+++ b/drivers/tpm/tpm_tis_i2c.h
@@ -35,21 +35,17 @@
struct tpm_chip;
-struct tpm_vendor_specific {
- const u8 req_complete_mask;
- const u8 req_complete_val;
- const u8 req_canceled;
+struct tpm_chip {
+ int is_open;
+ u8 req_complete_mask;
+ u8 req_complete_val;
+ u8 req_canceled;
int irq;
int locality;
unsigned long timeout_a, timeout_b, timeout_c, timeout_d; /* msec */
unsigned long duration[3]; /* msec */
};
-struct tpm_chip {
- int is_open;
- struct tpm_vendor_specific vendor;
-};
-
struct tpm_input_header {
__be16 tag;
__be32 length;
@@ -106,8 +102,6 @@
union tpm_cmd_params params;
} __packed;
-struct tpm_chip *tpm_register_hardware(const struct tpm_vendor_specific *);
-
struct udevice;
int tpm_vendor_init(struct udevice *dev);