auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flash: virtual: simplify error checking

Browse Source 
Return directly the error code returned by last called function
instead of handling it.

Change-Id: I967deb348db535de1972056021484f0e7f32df1c
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/9385
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Tested-by: jenkins
Reviewed-by: Marc Schink <dev@zapb.de>
This commit is contained in:
Antonio Borneo
2025-12-25 11:42:51 +01:00
parent 078a6b1f9f
commit 5151c98455
1 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/flash/nor/virtual.c
View File

@@ -93,34 +93,24 @@ static int virtual_erase(struct flash_bank *bank, unsigned int first,
unsigned int last) unsigned int last)
{ {
struct flash_bank *master_bank = virtual_get_master_bank(bank); struct flash_bank *master_bank = virtual_get_master_bank(bank);
int retval;
if (!master_bank) if (!master_bank)
return ERROR_FLASH_OPERATION_FAILED; return ERROR_FLASH_OPERATION_FAILED;
/* call master handler */ /* call master handler */
retval = master_bank->driver->erase(master_bank, first, last); return master_bank->driver->erase(master_bank, first, last);
if (retval != ERROR_OK)
return retval;
return ERROR_OK;
} }
static int virtual_write(struct flash_bank *bank, const uint8_t *buffer, static int virtual_write(struct flash_bank *bank, const uint8_t *buffer,
uint32_t offset, uint32_t count) uint32_t offset, uint32_t count)
{ {
struct flash_bank *master_bank = virtual_get_master_bank(bank); struct flash_bank *master_bank = virtual_get_master_bank(bank);
int retval;
if (!master_bank) if (!master_bank)
return ERROR_FLASH_OPERATION_FAILED; return ERROR_FLASH_OPERATION_FAILED;
/* call master handler */ /* call master handler */
retval = master_bank->driver->write(master_bank, buffer, offset, count); return master_bank->driver->write(master_bank, buffer, offset, count);
if (retval != ERROR_OK)
return retval;
return ERROR_OK;
} }
static int virtual_probe(struct flash_bank *bank) static int virtual_probe(struct flash_bank *bank)
@@ -177,34 +167,24 @@ static int virtual_info(struct flash_bank *bank, struct command_invocation *cmd)
static 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); struct flash_bank *master_bank = virtual_get_master_bank(bank);
int retval;
if (!master_bank) if (!master_bank)
return ERROR_FLASH_OPERATION_FAILED; return ERROR_FLASH_OPERATION_FAILED;
/* call master handler */ /* call master handler */
retval = master_bank->driver->erase_check(master_bank); return master_bank->driver->erase_check(master_bank);
if (retval != ERROR_OK)
return retval;
return ERROR_OK;
} }
static 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) uint8_t *buffer, uint32_t offset, uint32_t count)
{ {
struct flash_bank *master_bank = virtual_get_master_bank(bank); struct flash_bank *master_bank = virtual_get_master_bank(bank);
int retval;
if (!master_bank) if (!master_bank)
return ERROR_FLASH_OPERATION_FAILED; return ERROR_FLASH_OPERATION_FAILED;
/* call master handler */ /* call master handler */
retval = master_bank->driver->read(master_bank, buffer, offset, count); return master_bank->driver->read(master_bank, buffer, offset, count);
if (retval != ERROR_OK)
return retval;
return ERROR_OK;
} }
const struct flash_driver virtual_flash = { const struct flash_driver virtual_flash = {