Change return value on error.

[fw/openocd] / src / flash / nor / virtual.c

diff --git a/src/flash/nor/virtual.c b/src/flash/nor/virtual.c
index 4908c0c89454494d1d8c79307d90588b8c3dd0eb..f1e84c29e0204b03a349063f74ba58f763702eae 100644 (file)
--- a/src/flash/nor/virtual.c
+++ b/src/flash/nor/virtual.c
@@ -27,7 +27,7 @@ static struct flash_bank* virtual_get_master_bank(struct flash_bank *bank)
 {
        struct flash_bank* master_bank;
 
-       master_bank = get_flash_bank_by_name(bank->driver_priv);
+       master_bank = get_flash_bank_by_name_noprobe(bank->driver_priv);
        if (master_bank == NULL) {
                LOG_ERROR("master flash bank '%s' does not exist", (char*)bank->driver_priv);
        }
@@ -55,13 +55,12 @@ FLASH_BANK_COMMAND_HANDLER(virtual_flash_bank_command)
 {
        if (CMD_ARGC < 7)
        {
-               LOG_WARNING("incomplete flash_bank virtual configuration");
-               return ERROR_FLASH_OPERATION_FAILED;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        /* get the master flash bank */
        const char *bank_name = CMD_ARGV[6];
-       struct flash_bank *master_bank = get_flash_bank_by_name(bank_name);
+       struct flash_bank *master_bank = get_flash_bank_by_name_noprobe(bank_name);
 
        if (master_bank == NULL)
        {
@@ -195,7 +194,7 @@ static int virtual_info(struct flash_bank *bank, char *buf, int buf_size)
        return ERROR_OK;
 }
 
-int virtual_blank_check(struct flash_bank *bank)
+static int virtual_blank_check(struct flash_bank *bank)
 {
        struct flash_bank *master_bank = virtual_get_master_bank(bank);
        int retval;
@@ -211,7 +210,7 @@ int virtual_blank_check(struct flash_bank *bank)
        return ERROR_OK;
 }
 
-int virtual_flash_read(struct flash_bank *bank,
+static int virtual_flash_read(struct flash_bank *bank,
                uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        struct flash_bank *master_bank = virtual_get_master_bank(bank);