From 0a89d5237edcec3015363e9a7a3bd8b014fec500 Mon Sep 17 00:00:00 2001 From: Sergii Dmytruk Date: Sat, 29 Oct 2022 16:57:07 +0300 Subject: security/tpm: remove tis_close() This function was never called from outside of drivers and src/drivers/pc80/tpm/tis.c was the only one doing it in a questionable way. tpm_vendor_cleanup() also isn't needed as one of tis_close() functions was its only caller. Change-Id: I9df76adfc21fca9fa1d1af7c40635ec0684ceb0f Ticket: https://ticket.coreboot.org/issues/433 Signed-off-by: Sergii Dmytruk Reviewed-on: https://review.coreboot.org/c/coreboot/+/68989 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/drivers/i2c/tpm/cr50.c | 4 ---- src/drivers/i2c/tpm/tis.c | 10 ---------- src/drivers/i2c/tpm/tis_atmel.c | 5 ----- src/drivers/i2c/tpm/tpm.c | 5 ----- src/drivers/i2c/tpm/tpm.h | 2 -- 5 files changed, 26 deletions(-) (limited to 'src/drivers/i2c') diff --git a/src/drivers/i2c/tpm/cr50.c b/src/drivers/i2c/tpm/cr50.c index b5cb32ce39..42eeff4b74 100644 --- a/src/drivers/i2c/tpm/cr50.c +++ b/src/drivers/i2c/tpm/cr50.c @@ -494,10 +494,6 @@ int tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr) return 0; } -void tpm_vendor_cleanup(struct tpm_chip *chip) -{ -} - enum cb_err tis_vendor_write(unsigned int addr, const void *buffer, size_t bytes) { return cr50_i2c_write(addr & 0xff, buffer, bytes) ? CB_ERR : CB_SUCCESS; diff --git a/src/drivers/i2c/tpm/tis.c b/src/drivers/i2c/tpm/tis.c index ea8cf3de70..9e2052ebf0 100644 --- a/src/drivers/i2c/tpm/tis.c +++ b/src/drivers/i2c/tpm/tis.c @@ -39,16 +39,6 @@ int tis_open(void) return 0; } -int tis_close(void) -{ - if (chip.is_open) { - tpm_vendor_cleanup(&chip); - chip.is_open = 0; - } - - return 0; -} - int tis_init(void) { return tpm_vendor_probe(CONFIG_DRIVER_TPM_I2C_BUS, diff --git a/src/drivers/i2c/tpm/tis_atmel.c b/src/drivers/i2c/tpm/tis_atmel.c index 3a87dec698..669ac68f6c 100644 --- a/src/drivers/i2c/tpm/tis_atmel.c +++ b/src/drivers/i2c/tpm/tis_atmel.c @@ -27,11 +27,6 @@ int tis_open(void) return 0; } -int tis_close(void) -{ - return 0; -} - int tis_init(void) { return 0; diff --git a/src/drivers/i2c/tpm/tpm.c b/src/drivers/i2c/tpm/tpm.c index 840b947ee7..606f14d07c 100644 --- a/src/drivers/i2c/tpm/tpm.c +++ b/src/drivers/i2c/tpm/tpm.c @@ -550,8 +550,3 @@ out_err: release_locality(chip, 0, 1); return -1; } - -void tpm_vendor_cleanup(struct tpm_chip *chip) -{ - release_locality(chip, chip->vendor.locality, 1); -} diff --git a/src/drivers/i2c/tpm/tpm.h b/src/drivers/i2c/tpm/tpm.h index eb4fef1167..868b306c36 100644 --- a/src/drivers/i2c/tpm/tpm.h +++ b/src/drivers/i2c/tpm/tpm.h @@ -61,6 +61,4 @@ int tpm_vendor_probe(unsigned int bus, uint32_t addr); int tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr); -void tpm_vendor_cleanup(struct tpm_chip *chip); - #endif /* __DRIVERS_TPM_SLB9635_I2C_TPM_H__ */ -- cgit v1.2.3