cfi_intel_pri_ext_t -> struct cfi_intel_pri_ext

Remove misleading typedef and redundant suffix from struct cfi_intel_pri_ext.

diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index a50a34991a2335dbf319cb947c661c0ba3b9cc75..39eb16c7ef028af6d23064c05223f1a9325cf8e9 100644 (file)
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -316,7 +316,7 @@ static int cfi_read_intel_pri_ext(flash_bank_t *bank)
 {
        int retval;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
 {
        int retval;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;

-       cfi_intel_pri_ext_t *pri_ext = malloc(sizeof(cfi_intel_pri_ext_t));
+       struct cfi_intel_pri_ext *pri_ext = malloc(sizeof(struct cfi_intel_pri_ext));

        target_t *target = bank->target;
        uint8_t command[8];
 
        target_t *target = bank->target;
        uint8_t command[8];
 


@@ -563,7 +563,7 @@ static int cfi_intel_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
        int printed;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
 {
        int printed;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;

-       cfi_intel_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_intel_pri_ext *pri_ext = cfi_info->pri_ext;

 
        printed = snprintf(buf, buf_size, "\nintel primary algorithm extend information:\n");
        buf += printed;
 
        printed = snprintf(buf, buf_size, "\nintel primary algorithm extend information:\n");
        buf += printed;


@@ -801,7 +801,7 @@ static int cfi_intel_protect(struct flash_bank_s *bank, int set, int first, int
 {
        int retval;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
 {
        int retval;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;

-       cfi_intel_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_intel_pri_ext *pri_ext = cfi_info->pri_ext;

        target_t *target = bank->target;
        uint8_t command[8];
        int retry = 0;
        target_t *target = bank->target;
        uint8_t command[8];
        int retry = 0;


@@ -2448,7 +2448,7 @@ static int cfi_intel_protect_check(struct flash_bank_s *bank)
 {
        int retval;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;
 {
        int retval;
        struct cfi_flash_bank *cfi_info = bank->driver_priv;

-       cfi_intel_pri_ext_t *pri_ext = cfi_info->pri_ext;
+       struct cfi_intel_pri_ext *pri_ext = cfi_info->pri_ext;

        target_t *target = bank->target;
        uint8_t command[CFI_MAX_BUS_WIDTH];
        int i;
        target_t *target = bank->target;
        uint8_t command[CFI_MAX_BUS_WIDTH];
        int i;

diff --git a/src/flash/cfi.h b/src/flash/cfi.h
index 9cf7d58237e5db48241b0626b0998ca3961ff0e1..89ddc404e4ecabb23348d4f88f8517024118fee9 100644 (file)
--- a/src/flash/cfi.h
+++ b/src/flash/cfi.h
@@ -76,7 +76,7 @@ struct cfi_flash_bank
  * as defined for the Advanced+ Boot Block Flash Memory (C3)
  * and used by the linux kernel cfi driver (as of 2.6.14)
  */
  * as defined for the Advanced+ Boot Block Flash Memory (C3)
  * and used by the linux kernel cfi driver (as of 2.6.14)
  */

-typedef struct cfi_intel_pri_ext_s
+struct cfi_intel_pri_ext

 {
        char pri[3];
        uint8_t major_version;
 {
        char pri[3];
        uint8_t major_version;


@@ -91,7 +91,7 @@ typedef struct cfi_intel_pri_ext_s
        uint8_t fact_prot_reg_size;
        uint8_t user_prot_reg_size;
        uint8_t extra[0];
        uint8_t fact_prot_reg_size;
        uint8_t user_prot_reg_size;
        uint8_t extra[0];

-} cfi_intel_pri_ext_t;
+};

 
 /* Spansion primary extended query table as defined for and used by
  * the linux kernel cfi driver (as of 2.6.15)
 
 /* Spansion primary extended query table as defined for and used by
  * the linux kernel cfi driver (as of 2.6.15)