nand_block_t -> struct nand_block

Remove misleading typedef and redundant suffix from struct nand_block.

diff --git a/src/flash/nand.c b/src/flash/nand.c
index 794836127d166944459a2a1f176d7adc5783341f..1100205a906922b5a0f5f3af6f3a647a5bda4898 100644 (file)
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -602,7 +602,7 @@ int nand_probe(struct nand_device_s *nand)
        }
 
        nand->num_blocks = (nand->device->chip_size * 1024) / (nand->erase_size / 1024);
-       nand->blocks = malloc(sizeof(nand_block_t) * nand->num_blocks);
+       nand->blocks = malloc(sizeof(struct nand_block) * nand->num_blocks);
 
        for (i = 0; i < nand->num_blocks; i++)
        {

diff --git a/src/flash/nand.h b/src/flash/nand.h
index ea319479846586a8bed03b6ec2db2ead77070b55..c6d4075187a4f3176dd15b27687c0257a1ce569a 100644 (file)
--- a/src/flash/nand.h
+++ b/src/flash/nand.h
@@ -53,13 +53,13 @@ struct nand_flash_controller
 
 #define NAND_DEVICE_COMMAND_HANDLER(name) static __NAND_DEVICE_COMMAND(name)
 
-typedef struct nand_block_s
+struct nand_block
 {
        uint32_t offset;
        uint32_t size;
        int is_erased;
        int is_bad;
-} nand_block_t;
+};
 
 struct nand_oobfree {
        int offset;
@@ -85,7 +85,7 @@ typedef struct nand_device_s
        int erase_size;
        int use_raw;
        int num_blocks;
-       nand_block_t *blocks;
+       struct nand_block *blocks;
        struct nand_device_s *next;
 } nand_device_t;