cfi_atmel_pri_ext_t -> struct cfi_atmel_pri_ext

Remove misleading typedef and redundant suffix from struct cfi_atmel_pri_ext.

diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index 39eb16c7ef028af6d23064c05223f1a9325cf8e9..fe80c74e6f6bdbdb64ff8a71aa1a469217beb3bf 100644 (file)
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -446,7 +446,7 @@ static int cfi_read_spansion_pri_ext(flash_bank_t *bank)
 static int cfi_read_atmel_pri_ext(flash_bank_t *bank)
 {
        int retval;
-       cfi_atmel_pri_ext_t atmel_pri_ext;
+       struct cfi_atmel_pri_ext atmel_pri_ext;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
        cfi_spansion_pri_ext_t *pri_ext = malloc(sizeof(cfi_spansion_pri_ext_t));
        target_t *target = bank->target;

diff --git a/src/flash/cfi.h b/src/flash/cfi.h
index 89ddc404e4ecabb23348d4f88f8517024118fee9..565f8ef17fdada54d01e2118df9067ef681f32b4 100644 (file)
--- a/src/flash/cfi.h
+++ b/src/flash/cfi.h
@@ -120,7 +120,7 @@ typedef struct cfi_spansion_pri_ext_s
 /* 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,7 +129,7 @@ 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,