flash: blank check use default_flash_blank_check

[openocd.git] / src / flash / nor / fm3.c

diff --git a/src/flash/nor/fm3.c b/src/flash/nor/fm3.c
index 9f9695e75d4f27f9694a04b7180a53a81c7caefb..0c6301d4fcceaf5eb8d379020b2e4903337a6a2c 100644 (file)
--- a/src/flash/nor/fm3.c
+++ b/src/flash/nor/fm3.c
@@ -31,8 +31,7 @@
 #define FLASH_DQ6 0x00000040   /* Data toggle flag bit (TOGG) position */
 #define FLASH_DQ5 0x00000020   /* Time limit exceeding flag bit (TLOV) position */
 
-enum fm3_variant
-{
+enum fm3_variant {
        mb9bfxx1,       /* Flash Type '1' */
        mb9bfxx2,
        mb9bfxx3,
@@ -47,15 +46,13 @@ enum fm3_variant
        mb9afxx6
 };
 
-enum fm3_flash_type
-{
+enum fm3_flash_type {
        fm3_no_flash_type = 0,
        fm3_flash_type1   = 1,
        fm3_flash_type2   = 2
 };
 
-struct fm3_flash_bank
-{
+struct fm3_flash_bank {
        struct working_area *write_algorithm;
        enum fm3_variant variant;
        enum fm3_flash_type flashtype;
@@ -582,7 +579,6 @@ static int fm3_probe(struct flash_bank *bank)
 
        bank->sectors = malloc(sizeof(struct flash_sector) * num_pages);
        bank->base = 0x00000000;
-       num_pages = 2;                          /* start with smallest Flash pages number */
        bank->size = 32 * 1024;         /* bytes */
 
        bank->sectors[0].offset = 0;
@@ -826,6 +822,6 @@ struct flash_driver fm3_flash = {
        .write = fm3_write_block,
        .probe = fm3_probe,
        .auto_probe = fm3_auto_probe,
-       .erase_check = default_flash_mem_blank_check,
+       .erase_check = default_flash_blank_check,
        .info = fm3_info,
 };