nand_manufacturer_t -> struct nand_manufacturer

Remove misleading typedef and redundant suffix from struct nand_manufacturer.

diff --git a/src/flash/nand.c b/src/flash/nand.c
index b2017c3d0543de96dd7b0b6785389f31620c17fc..dba18777826f40cdc89b79de756f61eac41320b6 100644 (file)
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -154,7 +154,7 @@ static nand_info_t nand_flash_ids[] =
 
 /* Manufacturer ID list
  */
-static nand_manufacturer_t nand_manuf_ids[] =
+static struct nand_manufacturer nand_manuf_ids[] =
 {
        {0x0, "unknown"},
        {NAND_MFR_TOSHIBA, "Toshiba"},

diff --git a/src/flash/nand.h b/src/flash/nand.h
index 922f08a9c19f5c4b9737488fb359a02424a3c953..93fd34ff7f301ff6d8397423dce00386030068bd 100644 (file)
--- a/src/flash/nand.h
+++ b/src/flash/nand.h
@@ -77,7 +77,7 @@ typedef struct nand_device_s
 {
        struct nand_flash_controller *controller;
        void *controller_priv;
-       struct nand_manufacturer_s *manufacturer;
+       struct nand_manufacturer *manufacturer;
        struct nand_info_s *device;
        int bus_width;
        int address_cycles;
@@ -103,11 +103,11 @@ enum
        NAND_MFR_MICRON = 0x2c,
 };
 
-typedef struct nand_manufacturer_s
+struct nand_manufacturer
 {
        int id;
        char *name;
-} nand_manufacturer_t;
+};
 
 typedef struct nand_info_s
 {