From: Ilias Apalodimas Date: Tue, 9 Nov 2021 07:02:16 +0000 (+0200) Subject: tpm: refactor function names for LPC based TPMs X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=c9e6d9c8e573ea3dec4362319162af4e125076f7;p=u-boot.git tpm: refactor function names for LPC based TPMs With the upcoming TPM2 API, some of the functions name are part of the new header file. So switch conflicting internal function names and defines. Reviewed-by: Simon Glass Reviewed-by: Heinrich Schuchardt Signed-off-by: Ilias Apalodimas --- diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c index 003c0d8816..13a133d58e 100644 --- a/drivers/tpm/tpm_tis_lpc.c +++ b/drivers/tpm/tpm_tis_lpc.c @@ -443,7 +443,7 @@ static int tpm_tis_lpc_open(struct udevice *dev) return 0; } -static int tpm_tis_get_desc(struct udevice *dev, char *buf, int size) +static int tpm_tis_lpc_get_desc(struct udevice *dev, char *buf, int size) { ulong chip_type = dev_get_driver_data(dev); @@ -458,7 +458,7 @@ static int tpm_tis_get_desc(struct udevice *dev, char *buf, int size) static const struct tpm_ops tpm_tis_lpc_ops = { .open = tpm_tis_lpc_open, .close = tpm_tis_lpc_close, - .get_desc = tpm_tis_get_desc, + .get_desc = tpm_tis_lpc_get_desc, .send = tis_senddata, .recv = tis_readresponse, };