NOR: cleanup driver decls

Fix goofy struct indents.  Function names *are* their addresses.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

diff --git a/src/flash/nor/aduc702x.c b/src/flash/nor/aduc702x.c
index 211b54e7598485bdff00d15393f5fce8bead94bb..7e81b327dcd3d13e8d5e640e38ffe84711c84d99 100644 (file)
--- a/src/flash/nor/aduc702x.c
+++ b/src/flash/nor/aduc702x.c
@@ -412,14 +412,14 @@ static int aduc702x_check_flash_completion(struct target* target, unsigned int t
 }
 
 struct flash_driver aduc702x_flash = {
-               .name = "aduc702x",
-               .flash_bank_command = &aduc702x_flash_bank_command,
-               .erase = &aduc702x_erase,
-               .protect = &aduc702x_protect,
-               .write = &aduc702x_write,
-               .probe = &aduc702x_probe,
-               .auto_probe = &aduc702x_probe,
-               .erase_check = &default_flash_blank_check,
-               .protect_check = &aduc702x_protect_check,
-               .info = &aduc702x_info
-       };
+       .name = "aduc702x",
+       .flash_bank_command = aduc702x_flash_bank_command,
+       .erase = aduc702x_erase,
+       .protect = aduc702x_protect,
+       .write = aduc702x_write,
+       .probe = aduc702x_probe,
+       .auto_probe = aduc702x_probe,
+       .erase_check = default_flash_blank_check,
+       .protect_check = aduc702x_protect_check,
+       .info = aduc702x_info
+};

diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index 5dacf6fda79c8040a6da2885135cdedb4844abcf..1b2f27c2550062a148912d6898a910c1b3b0c2ab 100644 (file)
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -2501,15 +2501,15 @@ static const struct command_registration at91sam3_command_handlers[] = {
 };
 
 struct flash_driver at91sam3_flash = {
-               .name = "at91sam3",
-               .commands = at91sam3_command_handlers,
-               .flash_bank_command = &sam3_flash_bank_command,
-               .erase = &sam3_erase,
-               .protect = &sam3_protect,
-               .write = &sam3_write,
-               .probe = &sam3_probe,
-               .auto_probe = &sam3_auto_probe,
-               .erase_check = &sam3_erase_check,
-               .protect_check = &sam3_protect_check,
-               .info = &sam3_info,
-       };
+       .name = "at91sam3",
+       .commands = at91sam3_command_handlers,
+       .flash_bank_command = sam3_flash_bank_command,
+       .erase = sam3_erase,
+       .protect = sam3_protect,
+       .write = sam3_write,
+       .probe = sam3_probe,
+       .auto_probe = sam3_auto_probe,
+       .erase_check = sam3_erase_check,
+       .protect_check = sam3_protect_check,
+       .info = sam3_info,
+};

diff --git a/src/flash/nor/avrf.c b/src/flash/nor/avrf.c
index 6c2d17fe5d782241144f654acd410e71e3bb485b..c0724190507a55a21fea0294b49a56449086a92b 100644 (file)
--- a/src/flash/nor/avrf.c
+++ b/src/flash/nor/avrf.c
@@ -452,7 +452,7 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command)
 static const struct command_registration avrf_exec_command_handlers[] = {
        {
                .name = "mass_erase",
-               .handler = &avrf_handle_mass_erase_command,
+               .handler = avrf_handle_mass_erase_command,
                .mode = COMMAND_EXEC,
                .help = "erase entire device",
        },
@@ -469,15 +469,15 @@ static const struct command_registration avrf_command_handlers[] = {
 };
 
 struct flash_driver avr_flash = {
-               .name = "avr",
-               .commands = avrf_command_handlers,
-               .flash_bank_command = &avrf_flash_bank_command,
-               .erase = &avrf_erase,
-               .protect = &avrf_protect,
-               .write = &avrf_write,
-               .probe = &avrf_probe,
-               .auto_probe = &avrf_auto_probe,
-               .erase_check = &default_flash_mem_blank_check,
-               .protect_check = &avrf_protect_check,
-               .info = &avrf_info,
-       };
+       .name = "avr",
+       .commands = avrf_command_handlers,
+       .flash_bank_command = avrf_flash_bank_command,
+       .erase = avrf_erase,
+       .protect = avrf_protect,
+       .write = avrf_write,
+       .probe = avrf_probe,
+       .auto_probe = avrf_auto_probe,
+       .erase_check = default_flash_mem_blank_check,
+       .protect_check = avrf_protect_check,
+       .info = avrf_info,
+};

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 71270b99a944d338defbcac7239312ff5d076483..42aa294777a68427b40bf601072727064fa30159 100644 (file)
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -2618,14 +2618,14 @@ static int cfi_info(struct flash_bank *bank, char *buf, int buf_size)
 }
 
 struct flash_driver cfi_flash = {
-               .name = "cfi",
-               .flash_bank_command = &cfi_flash_bank_command,
-               .erase = &cfi_erase,
-               .protect = &cfi_protect,
-               .write = &cfi_write,
-               .probe = &cfi_probe,
-               .auto_probe = &cfi_auto_probe,
-               .erase_check = &default_flash_blank_check,
-               .protect_check = &cfi_protect_check,
-               .info = &cfi_info,
-       };
+       .name = "cfi",
+       .flash_bank_command = cfi_flash_bank_command,
+       .erase = cfi_erase,
+       .protect = cfi_protect,
+       .write = cfi_write,
+       .probe = cfi_probe,
+       .auto_probe = cfi_auto_probe,
+       .erase_check = default_flash_blank_check,
+       .protect_check = cfi_protect_check,
+       .info = cfi_info,
+};

diff --git a/src/flash/nor/ecos.c b/src/flash/nor/ecos.c
index b51e0a0338c3ff28132cfb35fc13abe9e2846dc8..783a40c1b80bee6f521dbb27bac6f6eef9779127 100644 (file)
--- a/src/flash/nor/ecos.c
+++ b/src/flash/nor/ecos.c
@@ -431,14 +431,14 @@ static int ecosflash_handle_gpnvm_command(struct command_context *cmd_ctx, char
 #endif
 
 struct flash_driver ecosflash_flash = {
-               .name = "ecosflash",
-               .flash_bank_command = &ecosflash_flash_bank_command,
-               .erase = &ecosflash_erase,
-               .protect = &ecosflash_protect,
-               .write = &ecosflash_write,
-               .probe = &ecosflash_probe,
-               .auto_probe = &ecosflash_probe,
-               .erase_check = &default_flash_blank_check,
-               .protect_check = &ecosflash_protect_check,
-               .info = &ecosflash_info
-       };
+       .name = "ecosflash",
+       .flash_bank_command = ecosflash_flash_bank_command,
+       .erase = ecosflash_erase,
+       .protect = ecosflash_protect,
+       .write = ecosflash_write,
+       .probe = ecosflash_probe,
+       .auto_probe = ecosflash_probe,
+       .erase_check = default_flash_blank_check,
+       .protect_check = ecosflash_protect_check,
+       .info = ecosflash_info
+};

diff --git a/src/flash/nor/faux.c b/src/flash/nor/faux.c
index 948f305572a17e1b204bb98074b2989bfea591d8..e1e77eaa23864d14d9364bd4d723c7c67e7853a2 100644 (file)
--- a/src/flash/nor/faux.c
+++ b/src/flash/nor/faux.c
@@ -135,15 +135,15 @@ static const struct command_registration faux_command_handlers[] = {
 };
 
 struct flash_driver faux_flash = {
-               .name = "faux",
-               .commands = faux_command_handlers,
-               .flash_bank_command = &faux_flash_bank_command,
-               .erase = &faux_erase,
-               .protect = &faux_protect,
-               .write = &faux_write,
-               .probe = &faux_probe,
-               .auto_probe = &faux_probe,
-               .erase_check = &default_flash_blank_check,
-               .protect_check = &faux_protect_check,
-               .info = &faux_info
-       };
+       .name = "faux",
+       .commands = faux_command_handlers,
+       .flash_bank_command = faux_flash_bank_command,
+       .erase = faux_erase,
+       .protect = faux_protect,
+       .write = faux_write,
+       .probe = faux_probe,
+       .auto_probe = faux_probe,
+       .erase_check = default_flash_blank_check,
+       .protect_check = faux_protect_check,
+       .info = faux_info
+};

diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c
index ae0a384b6febff60c80ae9a81de35fe9f15b2ad4..fc2b1cfc9ae54cc8148ee7a120ea49aacfd18ece 100644 (file)
--- a/src/flash/nor/lpc2000.c
+++ b/src/flash/nor/lpc2000.c
@@ -783,7 +783,7 @@ COMMAND_HANDLER(lpc2000_handle_part_id_command)
 static const struct command_registration lpc2000_exec_command_handlers[] = {
        {
                .name = "part_id",
-               .handler = &lpc2000_handle_part_id_command,
+               .handler = lpc2000_handle_part_id_command,
                .mode = COMMAND_EXEC,
                .help = "print part id of lpc2000 flash bank <num>",
        },
@@ -800,17 +800,15 @@ static const struct command_registration lpc2000_command_handlers[] = {
 };
 
 struct flash_driver lpc2000_flash = {
-               .name = "lpc2000",
-               .commands = lpc2000_command_handlers,
-               .flash_bank_command = &lpc2000_flash_bank_command,
-               .erase = &lpc2000_erase,
-               .protect = &lpc2000_protect,
-               .write = &lpc2000_write,
-               .probe = &lpc2000_probe,
-               .auto_probe = &lpc2000_probe,
-               .erase_check = &lpc2000_erase_check,
-               .protect_check = &lpc2000_protect_check,
-               .info = &lpc2000_info,
-       };
-
-
+       .name = "lpc2000",
+       .commands = lpc2000_command_handlers,
+       .flash_bank_command = lpc2000_flash_bank_command,
+       .erase = lpc2000_erase,
+       .protect = lpc2000_protect,
+       .write = lpc2000_write,
+       .probe = lpc2000_probe,
+       .auto_probe = lpc2000_probe,
+       .erase_check = lpc2000_erase_check,
+       .protect_check = lpc2000_protect_check,
+       .info = lpc2000_info,
+};

diff --git a/src/flash/nor/lpc288x.c b/src/flash/nor/lpc288x.c
index 5cb36d07de64277f219e28dfb60ed90a7325912e..5ab4e9ccef98a796370eabb63977228156567405 100644 (file)
--- a/src/flash/nor/lpc288x.c
+++ b/src/flash/nor/lpc288x.c
@@ -473,14 +473,14 @@ static int lpc288x_protect(struct flash_bank *bank, int set, int first, int last
 }
 
 struct flash_driver lpc288x_flash = {
-               .name = "lpc288x",
-               .flash_bank_command = &lpc288x_flash_bank_command,
-               .erase = &lpc288x_erase,
-               .protect = &lpc288x_protect,
-               .write = &lpc288x_write,
-               .probe = &lpc288x_probe,
-               .auto_probe = &lpc288x_probe,
-               .erase_check = &lpc288x_erase_check,
-               .protect_check = &lpc288x_protect_check,
-               .info = &lpc288x_info,
-       };
+       .name = "lpc288x",
+       .flash_bank_command = lpc288x_flash_bank_command,
+       .erase = lpc288x_erase,
+       .protect = lpc288x_protect,
+       .write = lpc288x_write,
+       .probe = lpc288x_probe,
+       .auto_probe = lpc288x_probe,
+       .erase_check = lpc288x_erase_check,
+       .protect_check = lpc288x_protect_check,
+       .info = lpc288x_info,
+};

diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c
index d39b2ddf72fc2e12839905c2351155414fcb0231..360c14deffb6f690061b39a26d5bd422fe728e0d 100644 (file)
--- a/src/flash/nor/lpc2900.c
+++ b/src/flash/nor/lpc2900.c
@@ -951,14 +951,14 @@ COMMAND_HANDLER(lpc2900_handle_secure_jtag_command)
 static const struct command_registration lpc2900_exec_command_handlers[] = {
        {
                .name = "signature",
-               .handler = &lpc2900_handle_signature_command,
+               .handler = lpc2900_handle_signature_command,
                .mode = COMMAND_EXEC,
                .usage = "bank_id",
                .help = "Calculate and display signature of flash bank.",
        },
        {
                .name = "read_custom",
-               .handler = &lpc2900_handle_read_custom_command,
+               .handler = lpc2900_handle_read_custom_command,
                .mode = COMMAND_EXEC,
                .usage = "bank_id filename",
                .help = "Copies 912 bytes of customer information "
@@ -966,14 +966,14 @@ static const struct command_registration lpc2900_exec_command_handlers[] = {
        },
        {
                .name = "password",
-               .handler = &lpc2900_handle_password_command,
+               .handler = lpc2900_handle_password_command,
                .mode = COMMAND_EXEC,
                .usage = "bank_id password",
                .help = "Enter fixed password to enable 'dangerous' options.",
        },
        {
                .name = "write_custom",
-               .handler = &lpc2900_handle_write_custom_command,
+               .handler = lpc2900_handle_write_custom_command,
                .mode = COMMAND_EXEC,
                .usage = "bank_id filename ('bin'|'ihex'|'elf'|'s19')",
                .help = "Copies 912 bytes of customer info from file "
@@ -981,7 +981,7 @@ static const struct command_registration lpc2900_exec_command_handlers[] = {
        },
        {
                .name = "secure_sector",
-               .handler = &lpc2900_handle_secure_sector_command,
+               .handler = lpc2900_handle_secure_sector_command,
                .mode = COMMAND_EXEC,
                .usage = "bank_id first_sector last_sector",
                .help = "Activate sector security for a range of sectors.  "
@@ -989,7 +989,7 @@ static const struct command_registration lpc2900_exec_command_handlers[] = {
        },
        {
                .name = "secure_jtag",
-               .handler = &lpc2900_handle_secure_jtag_command,
+               .handler = lpc2900_handle_secure_jtag_command,
                .mode = COMMAND_EXEC,
                .usage = "bank_id",
                .help = "Disable the JTAG port.  "

diff --git a/src/flash/nor/ocl.c b/src/flash/nor/ocl.c
index 961537e088e004461219090344a4849d7afa34bf..5d93724814bf8762ea50b4c1012c3bee4aacb0bf 100644 (file)
--- a/src/flash/nor/ocl.c
+++ b/src/flash/nor/ocl.c
@@ -348,14 +348,14 @@ static int ocl_auto_probe(struct flash_bank *bank)
 }
 
 struct flash_driver ocl_flash = {
-               .name = "ocl",
-               .flash_bank_command = &ocl_flash_bank_command,
-               .erase = &ocl_erase,
-               .protect = &ocl_protect,
-               .write = &ocl_write,
-               .probe = &ocl_probe,
-               .erase_check = &ocl_erase_check,
-               .protect_check = &ocl_protect_check,
-               .info = &ocl_info,
-               .auto_probe = &ocl_auto_probe,
-       };
+       .name = "ocl",
+       .flash_bank_command = ocl_flash_bank_command,
+       .erase = ocl_erase,
+       .protect = ocl_protect,
+       .write = ocl_write,
+       .probe = ocl_probe,
+       .erase_check = ocl_erase_check,
+       .protect_check = ocl_protect_check,
+       .info = ocl_info,
+       .auto_probe = ocl_auto_probe,
+};

diff --git a/src/flash/nor/pic32mx.c b/src/flash/nor/pic32mx.c
index 7d98af31142d4adf6c493099a31ee9d6d318164c..1f6634672bbf810d17d6e39b48fe24da3bd7be85 100644 (file)
--- a/src/flash/nor/pic32mx.c
+++ b/src/flash/nor/pic32mx.c
@@ -886,13 +886,13 @@ COMMAND_HANDLER(pic32mx_handle_pgm_word_command)
 static const struct command_registration pic32mx_exec_command_handlers[] = {
        {
                .name = "chip_erase",
-               .handler = &pic32mx_handle_chip_erase_command,
+               .handler = pic32mx_handle_chip_erase_command,
                .mode = COMMAND_EXEC,
                .help = "erase device",
        },
        {
                .name = "pgm_word",
-               .handler = &pic32mx_handle_pgm_word_command,
+               .handler = pic32mx_handle_pgm_word_command,
                .mode = COMMAND_EXEC,
                .help = "program a word",
        },
@@ -909,15 +909,15 @@ static const struct command_registration pic32mx_command_handlers[] = {
 };
 
 struct flash_driver pic32mx_flash = {
-               .name = "pic32mx",
-               .commands = pic32mx_command_handlers,
-               .flash_bank_command = &pic32mx_flash_bank_command,
-               .erase = &pic32mx_erase,
-               .protect = &pic32mx_protect,
-               .write = &pic32mx_write,
-               .probe = &pic32mx_probe,
-               .auto_probe = &pic32mx_auto_probe,
-               .erase_check = &default_flash_mem_blank_check,
-               .protect_check = &pic32mx_protect_check,
-               .info = &pic32mx_info,
-       };
+       .name = "pic32mx",
+       .commands = pic32mx_command_handlers,
+       .flash_bank_command = pic32mx_flash_bank_command,
+       .erase = pic32mx_erase,
+       .protect = pic32mx_protect,
+       .write = pic32mx_write,
+       .probe = pic32mx_probe,
+       .auto_probe = pic32mx_auto_probe,
+       .erase_check = default_flash_mem_blank_check,
+       .protect_check = pic32mx_protect_check,
+       .info = pic32mx_info,
+};

diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c
index 8d35f9b10f1d158f07725ffefa9cff145bf185fa..107b1c6d1767725d99fdc382bcd6145cf529df6f 100644 (file)
--- a/src/flash/nor/stellaris.c
+++ b/src/flash/nor/stellaris.c
@@ -1173,7 +1173,7 @@ COMMAND_HANDLER(stellaris_handle_mass_erase_command)
 static const struct command_registration stellaris_exec_command_handlers[] = {
        {
                .name = "mass_erase",
-               .handler = &stellaris_handle_mass_erase_command,
+               .handler = stellaris_handle_mass_erase_command,
                .mode = COMMAND_EXEC,
                .help = "erase entire device",
        },

diff --git a/src/flash/nor/stm32x.c b/src/flash/nor/stm32x.c
index 75dcf3b57c67cf147942dcaef6fd32d5d3e56979..eaa3a0e450177587d510c6de0c4c23a4f9ee0b1b 100644 (file)
--- a/src/flash/nor/stm32x.c
+++ b/src/flash/nor/stm32x.c
@@ -1193,35 +1193,35 @@ COMMAND_HANDLER(stm32x_handle_mass_erase_command)
 static const struct command_registration stm32x_exec_command_handlers[] = {
        {
                .name = "lock",
-               .handler = &stm32x_handle_lock_command,
+               .handler = stm32x_handle_lock_command,
                .mode = COMMAND_EXEC,
                .usage = "bank_id",
                .help = "Lock entire flash device.",
        },
        {
                .name = "unlock",
-               .handler = &stm32x_handle_unlock_command,
+               .handler = stm32x_handle_unlock_command,
                .mode = COMMAND_EXEC,
                .usage = "bank_id",
                .help = "Unlock entire protected flash device.",
        },
        {
                .name = "mass_erase",
-               .handler = &stm32x_handle_mass_erase_command,
+               .handler = stm32x_handle_mass_erase_command,
                .mode = COMMAND_EXEC,
                .usage = "bank_id",
                .help = "Erase entire flash device.",
        },
        {
                .name = "options_read",
-               .handler = &stm32x_handle_options_read_command,
+               .handler = stm32x_handle_options_read_command,
                .mode = COMMAND_EXEC,
                .usage = "bank_id",
                .help = "Read and display device option byte.",
        },
        {
                .name = "options_write",
-               .handler = &stm32x_handle_options_write_command,
+               .handler = stm32x_handle_options_write_command,
                .mode = COMMAND_EXEC,
                .usage = "bank_id ('SWWDG'|'HWWDG') "
                        "('RSTSTNDBY'|'NORSTSTNDBY') "
@@ -1241,15 +1241,15 @@ static const struct command_registration stm32x_command_handlers[] = {
 };
 
 struct flash_driver stm32x_flash = {
-               .name = "stm32x",
-               .commands = stm32x_command_handlers,
-               .flash_bank_command = &stm32x_flash_bank_command,
-               .erase = &stm32x_erase,
-               .protect = &stm32x_protect,
-               .write = &stm32x_write,
-               .probe = &stm32x_probe,
-               .auto_probe = &stm32x_auto_probe,
-               .erase_check = &default_flash_mem_blank_check,
-               .protect_check = &stm32x_protect_check,
-               .info = &stm32x_info,
-       };
+       .name = "stm32x",
+       .commands = stm32x_command_handlers,
+       .flash_bank_command = stm32x_flash_bank_command,
+       .erase = stm32x_erase,
+       .protect = stm32x_protect,
+       .write = stm32x_write,
+       .probe = stm32x_probe,
+       .auto_probe = stm32x_auto_probe,
+       .erase_check = default_flash_mem_blank_check,
+       .protect_check = stm32x_protect_check,
+       .info = stm32x_info,
+};

diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c
index 040097a0131a5caf9bfeae1b1fdaafad8cc63179..a2e27daeee1ca651dd52390f7515b44540a71087 100644 (file)
--- a/src/flash/nor/str7x.c
+++ b/src/flash/nor/str7x.c
@@ -676,7 +676,7 @@ COMMAND_HANDLER(str7x_handle_disable_jtag_command)
 static const struct command_registration str7x_exec_command_handlers[] = {
        {
                .name = "disable_jtag",
-               .handler = &str7x_handle_disable_jtag_command,
+               .handler = str7x_handle_disable_jtag_command,
                .mode = COMMAND_EXEC,
                .help = "disable jtag access",
        },
@@ -693,15 +693,15 @@ static const struct command_registration str7x_command_handlers[] = {
 };
 
 struct flash_driver str7x_flash = {
-               .name = "str7x",
-               .commands = str7x_command_handlers,
-               .flash_bank_command = &str7x_flash_bank_command,
-               .erase = &str7x_erase,
-               .protect = &str7x_protect,
-               .write = &str7x_write,
-               .probe = &str7x_probe,
-               .auto_probe = &str7x_probe,
-               .erase_check = &default_flash_blank_check,
-               .protect_check = &str7x_protect_check,
-               .info = &str7x_info,
-       };
+       .name = "str7x",
+       .commands = str7x_command_handlers,
+       .flash_bank_command = str7x_flash_bank_command,
+       .erase = str7x_erase,
+       .protect = str7x_protect,
+       .write = str7x_write,
+       .probe = str7x_probe,
+       .auto_probe = str7x_probe,
+       .erase_check = default_flash_blank_check,
+       .protect_check = str7x_protect_check,
+       .info = str7x_info,
+};

diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c
index d0c1278f572f9f35d4d9742ac267e75b8c19bed0..0875851e02d11342721711b63bf4dff16a1f641e 100644 (file)
--- a/src/flash/nor/str9x.c
+++ b/src/flash/nor/str9x.c
@@ -668,7 +668,7 @@ COMMAND_HANDLER(str9x_handle_flash_config_command)
 static const struct command_registration str9x_config_command_handlers[] = {
        {
                .name = "flash_config",
-               .handler = &str9x_handle_flash_config_command,
+               .handler = str9x_handle_flash_config_command,
                .mode = COMMAND_EXEC,
                .help = "Configure str9x flash controller, prior to "
                        "programming the flash.",
@@ -687,15 +687,15 @@ static const struct command_registration str9x_command_handlers[] = {
 };
 
 struct flash_driver str9x_flash = {
-               .name = "str9x",
-               .commands = str9x_command_handlers,
-               .flash_bank_command = &str9x_flash_bank_command,
-               .erase = &str9x_erase,
-               .protect = &str9x_protect,
-               .write = &str9x_write,
-               .probe = &str9x_probe,
-               .auto_probe = &str9x_probe,
-               .erase_check = &default_flash_blank_check,
-               .protect_check = &str9x_protect_check,
-               .info = &str9x_info,
-       };
+       .name = "str9x",
+       .commands = str9x_command_handlers,
+       .flash_bank_command = str9x_flash_bank_command,
+       .erase = str9x_erase,
+       .protect = str9x_protect,
+       .write = str9x_write,
+       .probe = str9x_probe,
+       .auto_probe = str9x_probe,
+       .erase_check = default_flash_blank_check,
+       .protect_check = str9x_protect_check,
+       .info = str9x_info,
+};

diff --git a/src/flash/nor/str9xpec.c b/src/flash/nor/str9xpec.c
index 734f2d1524ebb9d5f24dd47eb2faf39b1d48f3d2..f0e11a5e8c530f9a95205f8e03ede1f8ec3764b4 100644 (file)
--- a/src/flash/nor/str9xpec.c
+++ b/src/flash/nor/str9xpec.c
@@ -1244,15 +1244,15 @@ static const struct command_registration str9xpec_command_handlers[] = {
 };
 
 struct flash_driver str9xpec_flash = {
-               .name = "str9xpec",
-               .commands = str9xpec_command_handlers,
-               .flash_bank_command = &str9xpec_flash_bank_command,
-               .erase = &str9xpec_erase,
-               .protect = &str9xpec_protect,
-               .write = &str9xpec_write,
-               .probe = &str9xpec_probe,
-               .auto_probe = &str9xpec_probe,
-               .erase_check = &str9xpec_erase_check,
-               .protect_check = &str9xpec_protect_check,
-               .info = &str9xpec_info,
-       };
+       .name = "str9xpec",
+       .commands = str9xpec_command_handlers,
+       .flash_bank_command = str9xpec_flash_bank_command,
+       .erase = str9xpec_erase,
+       .protect = str9xpec_protect,
+       .write = str9xpec_write,
+       .probe = str9xpec_probe,
+       .auto_probe = str9xpec_probe,
+       .erase_check = str9xpec_erase_check,
+       .protect_check = str9xpec_protect_check,
+       .info = str9xpec_info,
+};

diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c
index cf40a81a75e4b49145d3d7f44be6eb02af9a6b1c..a40230b997271cc1bfc8eca340bcd91e833cec11 100644 (file)
--- a/src/flash/nor/tcl.c
+++ b/src/flash/nor/tcl.c
@@ -924,7 +924,7 @@ COMMAND_HANDLER(handle_flash_init_command)
 static const struct command_registration flash_config_command_handlers[] = {
        {
                .name = "bank",
-               .handler = &handle_flash_bank_command,
+               .handler = handle_flash_bank_command,
                .mode = COMMAND_CONFIG,
                .usage = "bank_id driver_name base_address size_bytes "
                        "chip_width_bytes bus_width_bytes target "
@@ -935,19 +935,19 @@ static const struct command_registration flash_config_command_handlers[] = {
        {
                .name = "init",
                .mode = COMMAND_CONFIG,
-               .handler = &handle_flash_init_command,
+               .handler = handle_flash_init_command,
                .help = "Initialize flash devices.",
        },
        {
                .name = "banks",
                .mode = COMMAND_ANY,
-               .handler = &handle_flash_banks_command,
+               .handler = handle_flash_banks_command,
                .help = "Display table with information about flash banks.",
        },
        {
                .name = "list",
                .mode = COMMAND_ANY,
-               .jim_handler = &jim_flash_list,
+               .jim_handler = jim_flash_list,
                .help = "Returns a list of details about the flash banks.",
        },
        COMMAND_REGISTRATION_DONE

diff --git a/src/flash/nor/tms470.c b/src/flash/nor/tms470.c
index 7efcbd4b918620217fb9341f30715064aba052d4..af635d424c7f29d25aacf41e1936ef81704ff3f8 100644 (file)
--- a/src/flash/nor/tms470.c
+++ b/src/flash/nor/tms470.c
@@ -821,19 +821,19 @@ static int tms470_erase_sector(struct flash_bank *bank, int sector)
 static const struct command_registration tms470_any_command_handlers[] = {
        {
                .name = "flash_keyset",
-               .handler = &tms470_handle_flash_keyset_command,
+               .handler = tms470_handle_flash_keyset_command,
                .mode = COMMAND_ANY,
                .help = "tms470 flash_keyset <key0> <key1> <key2> <key3>",
        },
        {
                .name = "osc_megahertz",
-               .handler = &tms470_handle_osc_megahertz_command,
+               .handler = tms470_handle_osc_megahertz_command,
                .mode = COMMAND_ANY,
                .help = "tms470 osc_megahertz <MHz>",
        },
        {
                .name = "plldis",
-               .handler = &tms470_handle_plldis_command,
+               .handler = tms470_handle_plldis_command,
                .mode = COMMAND_ANY,
                .help = "tms470 plldis <0/1>",
        },
@@ -1258,15 +1258,15 @@ FLASH_BANK_COMMAND_HANDLER(tms470_flash_bank_command)
 }
 
 struct flash_driver tms470_flash = {
-               .name = "tms470",
-               .commands = tms470_command_handlers,
-               .flash_bank_command = &tms470_flash_bank_command,
-               .erase = &tms470_erase,
-               .protect = &tms470_protect,
-               .write = &tms470_write,
-               .probe = &tms470_probe,
-               .auto_probe = &tms470_auto_probe,
-               .erase_check = &tms470_erase_check,
-               .protect_check = &tms470_protect_check,
-               .info = &tms470_info,
-       };
+       .name = "tms470",
+       .commands = tms470_command_handlers,
+       .flash_bank_command = tms470_flash_bank_command,
+       .erase = tms470_erase,
+       .protect = tms470_protect,
+       .write = tms470_write,
+       .probe = tms470_probe,
+       .auto_probe = tms470_auto_probe,
+       .erase_check = tms470_erase_check,
+       .protect_check = tms470_protect_check,
+       .info = tms470_info,
+};