From 453a103f48242b2b48031c7d268782df0347f81f Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Fri, 13 Nov 2009 07:37:43 -0800 Subject: [PATCH] cfi_fixup_t -> struct cfi_fixup Remove misleading typedef and redundant suffix from struct cfi_fixup. --- src/flash/cfi.c | 8 ++++---- src/flash/cfi.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/flash/cfi.c b/src/flash/cfi.c index 5cfac15f37..8c20e478ad 100644 --- a/src/flash/cfi.c +++ b/src/flash/cfi.c @@ -47,7 +47,7 @@ static void cfi_fixup_0002_unlock_addresses(flash_bank_t *flash, void *param); static void cfi_fixup_atmel_reversed_erase_regions(flash_bank_t *flash, void *param); /* fixup after reading cmdset 0002 primary query table */ -static const cfi_fixup_t cfi_0002_fixups[] = { +static const struct cfi_fixup cfi_0002_fixups[] = { {CFI_MFR_SST, 0x00D4, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]}, {CFI_MFR_SST, 0x00D5, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]}, {CFI_MFR_SST, 0x00D6, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]}, @@ -63,14 +63,14 @@ static const cfi_fixup_t cfi_0002_fixups[] = { }; /* fixup after reading cmdset 0001 primary query table */ -static const cfi_fixup_t cfi_0001_fixups[] = { +static const struct cfi_fixup cfi_0001_fixups[] = { {0, 0, NULL, NULL} }; -static void cfi_fixup(flash_bank_t *bank, const cfi_fixup_t *fixups) +static void cfi_fixup(flash_bank_t *bank, const struct cfi_fixup *fixups) { struct cfi_flash_bank *cfi_info = bank->driver_priv; - const cfi_fixup_t *f; + const struct cfi_fixup *f; for (f = fixups; f->fixup; f++) { diff --git a/src/flash/cfi.h b/src/flash/cfi.h index 73f8ea123b..7763aff671 100644 --- a/src/flash/cfi.h +++ b/src/flash/cfi.h @@ -142,13 +142,13 @@ struct cfi_unlock_addresses uint32_t unlock2; }; -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 -- 2.30.2