X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fcfi.h;h=7763aff671f5e226d4fa1d655ff9ea5e33f619a7;hb=43483e5054c78e0fdfaebed5e14c14246af07c97;hp=89ddc404e4ecabb23348d4f88f8517024118fee9;hpb=1f328f2885f370aa9f79d2ed08515821bc8d856a;p=openocd.git

diff --git a/src/flash/cfi.h b/src/flash/cfi.h
index 89ddc404e4..7763aff671 100644
--- a/src/flash/cfi.h
+++ b/src/flash/cfi.h
@@ -96,7 +96,7 @@ struct cfi_intel_pri_ext
 /* Spansion primary extended query table as defined for and used by
  * the linux kernel cfi driver (as of 2.6.15)
  */
-typedef struct cfi_spansion_pri_ext_s
+struct cfi_spansion_pri_ext
 {
 	uint8_t  pri[3];
 	uint8_t  major_version;
@@ -115,12 +115,12 @@ typedef struct cfi_spansion_pri_ext_s
 	int _reversed_geometry;
 	uint32_t _unlock1;
 	uint32_t _unlock2;
-} cfi_spansion_pri_ext_t;
+};
 
 /* Atmel primary extended query table as defined for and used by
  * the linux kernel cfi driver (as of 2.6.20+)
  */
-typedef struct cfi_atmel_pri_ext_s
+struct cfi_atmel_pri_ext
 {
 	uint8_t pri[3];
 	uint8_t major_version;
@@ -129,26 +129,26 @@ typedef struct cfi_atmel_pri_ext_s
 	uint8_t bottom_boot;
 	uint8_t burst_mode;
 	uint8_t page_mode;
-} cfi_atmel_pri_ext_t;
+};
 
 enum {
 	CFI_UNLOCK_555_2AA,
 	CFI_UNLOCK_5555_2AAA,
 };
 
-typedef struct cfi_unlock_addresses_s
+struct cfi_unlock_addresses
 {
 	uint32_t unlock1;
 	uint32_t unlock2;
-} cfi_unlock_addresses_t;
+};
 
-typedef struct cfi_fixup_s
+struct cfi_fixup
 {
 	uint16_t mfr;
 	uint16_t id;
 	void (*fixup)(flash_bank_t *flash, void *param);
 	void *param;
-} cfi_fixup_t;
+};
 
 #define CFI_MFR_AMD		0x0001
 #define CFI_MFR_FUJITSU	0x0004