nand_info_t -> struct nand_info

Remove misleading typedef and redundant suffix from struct nand_info.

diff --git a/src/flash/nand.c b/src/flash/nand.c
index dba18777826f40cdc89b79de756f61eac41320b6..794836127d166944459a2a1f176d7adc5783341f 100644 (file)
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -74,7 +74,7 @@ static command_t *nand_cmd;
  *     256     256 Byte page size
  *     512     512 Byte page size
  */
-static nand_info_t nand_flash_ids[] =
+static struct nand_info nand_flash_ids[] =
 {
        /* start "museum" IDs */
        {"NAND 1MiB 5V 8-bit",          0x6e, 256, 1, 0x1000, 0},

diff --git a/src/flash/nand.h b/src/flash/nand.h
index 93fd34ff7f301ff6d8397423dce00386030068bd..ea319479846586a8bed03b6ec2db2ead77070b55 100644 (file)
--- a/src/flash/nand.h
+++ b/src/flash/nand.h
@@ -78,7 +78,7 @@ typedef struct nand_device_s
        struct nand_flash_controller *controller;
        void *controller_priv;
        struct nand_manufacturer *manufacturer;
-       struct nand_info_s *device;
+       struct nand_info *device;
        int bus_width;
        int address_cycles;
        int page_size;
@@ -109,7 +109,7 @@ struct nand_manufacturer
        char *name;
 };
 
-typedef struct nand_info_s
+struct nand_info
 {
        char *name;
        int id;
@@ -117,7 +117,7 @@ typedef struct nand_info_s
        int chip_size;
        int erase_size;
        int options;
-} nand_info_t;
+};
 
 /* Option constants for bizarre disfunctionality and real features
  */