From 0c6d48f3ee6f58c83f63053a8c0e60003f52ef2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= <michal.zygowski@3mdeb.com>
Date: Wed, 24 Apr 2024 13:59:43 +0200
Subject: [PATCH] drivers/{crb,pc80/tpm}: Drop conflicting tpm_config_t typedef
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/drivers/crb/chip.h      | 4 ++--
 src/drivers/pc80/tpm/chip.h | 4 ++--
 src/drivers/pc80/tpm/tis.c  | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/drivers/crb/chip.h b/src/drivers/crb/chip.h
index f0e471fd48..ac7ea96982 100644
--- a/src/drivers/crb/chip.h
+++ b/src/drivers/crb/chip.h
@@ -3,7 +3,7 @@
 #ifndef DRIVERS_CRB_CHIP_H
 #define DRIVERS_CRB_CHIP_H
 
-typedef struct drivers_crb_config {
-} tpm_config_t;
+struct drivers_crb_config {
+};
 
 #endif /* DRIVERS_CRB_CHIP_H */
diff --git a/src/drivers/pc80/tpm/chip.h b/src/drivers/pc80/tpm/chip.h
index af731530f1..af37ceeb67 100644
--- a/src/drivers/pc80/tpm/chip.h
+++ b/src/drivers/pc80/tpm/chip.h
@@ -3,7 +3,7 @@
 #ifndef 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:
 	 *
@@ -13,6 +13,6 @@ typedef struct drivers_pc80_tpm_config {
 	 *  Falling Edge  3
 	 */
 	u8 irq_polarity;
-} tpm_config_t;
+};
 
 #endif /* DRIVERS_PC80_TPM_CHIP_H */
diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index d811c52e90..3f863a36da 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -779,9 +779,11 @@ static void lpc_tpm_read_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;
 
+	config = (struct drivers_pc80_tpm_config *)dev->chip_info;
+
 	for (res = dev->resource_list; res; res = res->next) {
 		if (!(res->flags & IORESOURCE_ASSIGNED))
 			continue;