From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Mon, 3 May 2021 16:48:54 -0400 Subject: [RFC 2/7] freescale: Drop unnecessary cpld_data_t non-typedef In-Reply-To: <20210503204859.18756-1-trini@konsulko.com> References: <20210503204859.18756-1-trini@konsulko.com> Message-ID: <20210503204859.18756-3-trini@konsulko.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de In some board cpld.h files the definition of the cpld_data struct not-quite makes a typedef for cpld_data_t. This problem is caught with gcc-11 as a multiple definition error. As there are no users of this non-typedef, fix this by not declaring it one to begin with. Cc: Priyanka Jain Cc: Shengzhou Liu Signed-off-by: Tom Rini --- board/freescale/t102xrdb/cpld.h | 2 +- board/freescale/t104xrdb/cpld.h | 3 +-- board/freescale/t208xrdb/cpld.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/board/freescale/t102xrdb/cpld.h b/board/freescale/t102xrdb/cpld.h index c05f536806fb..bd40cc319a89 100644 --- a/board/freescale/t102xrdb/cpld.h +++ b/board/freescale/t102xrdb/cpld.h @@ -21,7 +21,7 @@ struct cpld_data { u8 boot_override; /* 0x18 - Boot override register */ u8 boot_config1; /* 0x19 - Boot config override register*/ u8 boot_config2; /* 0x1A - Boot config override register*/ -} cpld_data_t; +}; /* Pointer to the CPLD register set */ diff --git a/board/freescale/t104xrdb/cpld.h b/board/freescale/t104xrdb/cpld.h index a816aef10a42..769883f9461f 100644 --- a/board/freescale/t104xrdb/cpld.h +++ b/board/freescale/t104xrdb/cpld.h @@ -30,8 +30,7 @@ struct cpld_data { u8 boot_override; /* 0x18 - Boot override register */ u8 boot_config1; /* 0x19 - Boot config override register*/ u8 boot_config2; /* 0x1A - Boot config override register*/ -} cpld_data_t; - +}; /* Pointer to the CPLD register set */ diff --git a/board/freescale/t208xrdb/cpld.h b/board/freescale/t208xrdb/cpld.h index bd6c203742e3..a623b1811faf 100644 --- a/board/freescale/t208xrdb/cpld.h +++ b/board/freescale/t208xrdb/cpld.h @@ -21,7 +21,7 @@ struct cpld_data { u8 boot_or; /* 0x16 - Boot config override register */ u8 boot_cfg1; /* 0x17 - Boot configuration register 1 */ u8 boot_cfg2; /* 0x18 - Boot configuration register 2 */ -} cpld_data_t; +}; u8 cpld_read(unsigned int reg); void cpld_write(unsigned int reg, u8 value); -- 2.17.1