sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/{crb,pc80/tpm}: Drop conflicting tpm_config_t typedef

Browse Source 
When both CRB and pc80 TPM drivers are compiled in, building fails
because the tpm_config_t typedef has two incompatible definitions.
Given that typedefs are discouraged by the project's coding style,
simply get rid of the tpm_config_t typedef.

TEST=Compile MSI PRO Z690-A target with CRB and PC80 TPM chips enabled
in devicetree.

Change-Id: Id41717e265362303a17745303a907c9c8f4f4e12
Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/82057
Reviewed-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Michał Żygowski
2024-04-24 13:59:43 +02:00
committed by Felix Held
parent a25f310830
commit 0c6d48f3ee
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/crb/chip.h
View File

@ -3,7 +3,7 @@
#ifndef DRIVERS_CRB_CHIP_H #ifndef DRIVERS_CRB_CHIP_H
#define DRIVERS_CRB_CHIP_H #define DRIVERS_CRB_CHIP_H
typedef struct drivers_crb_config { struct drivers_crb_config {
} tpm_config_t; };
#endif /* DRIVERS_CRB_CHIP_H */ #endif /* DRIVERS_CRB_CHIP_H */

4
src/drivers/pc80/tpm/chip.h
View File

@ -3,7 +3,7 @@
#ifndef DRIVERS_PC80_TPM_CHIP_H #ifndef DRIVERS_PC80_TPM_CHIP_H
#define DRIVERS_PC80_TPM_CHIP_H #define DRIVERS_PC80_TPM_CHIP_H
typedef struct drivers_pc80_tpm_config { struct drivers_pc80_tpm_config {
/* /*
* TPM Interrupt polarity: * TPM Interrupt polarity:
* *
@ -13,6 +13,6 @@ typedef struct drivers_pc80_tpm_config {
* Falling Edge 3 * Falling Edge 3
*/ */
u8 irq_polarity; u8 irq_polarity;
} tpm_config_t; };
#endif /* DRIVERS_PC80_TPM_CHIP_H */ #endif /* DRIVERS_PC80_TPM_CHIP_H */

4
src/drivers/pc80/tpm/tis.c
View File

@ -779,9 +779,11 @@ static void lpc_tpm_read_resources(struct device *dev)
static void lpc_tpm_set_resources(struct device *dev) static void lpc_tpm_set_resources(struct device *dev)
{ {
tpm_config_t *config = (tpm_config_t *)dev->chip_info; struct drivers_pc80_tpm_config *config;
DEVTREE_CONST struct resource *res; DEVTREE_CONST struct resource *res;
config = (struct drivers_pc80_tpm_config *)dev->chip_info;
for (res = dev->resource_list; res; res = res->next) { for (res = dev->resource_list; res; res = res->next) {
if (!(res->flags & IORESOURCE_ASSIGNED)) if (!(res->flags & IORESOURCE_ASSIGNED))
continue; continue;