From 5151c9845581ccd17e3ca3b9024f287f3f6c43de Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Thu, 25 Dec 2025 11:42:51 +0100 Subject: [PATCH] flash: virtual: simplify error checking Return directly the error code returned by last called function instead of handling it. Change-Id: I967deb348db535de1972056021484f0e7f32df1c Signed-off-by: Antonio Borneo Reviewed-on: https://review.openocd.org/c/openocd/+/9385 Reviewed-by: Tomas Vanek Tested-by: jenkins Reviewed-by: Marc Schink --- src/flash/nor/virtual.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/src/flash/nor/virtual.c b/src/flash/nor/virtual.c index c5e33385e..9db9b9216 100644 --- a/src/flash/nor/virtual.c +++ b/src/flash/nor/virtual.c @@ -93,34 +93,24 @@ static int virtual_erase(struct flash_bank *bank, unsigned int first, unsigned int last) { struct flash_bank *master_bank = virtual_get_master_bank(bank); - int retval; if (!master_bank) return ERROR_FLASH_OPERATION_FAILED; /* call master handler */ - retval = master_bank->driver->erase(master_bank, first, last); - if (retval != ERROR_OK) - return retval; - - return ERROR_OK; + return master_bank->driver->erase(master_bank, first, last); } static int virtual_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count) { struct flash_bank *master_bank = virtual_get_master_bank(bank); - int retval; if (!master_bank) return ERROR_FLASH_OPERATION_FAILED; /* call master handler */ - retval = master_bank->driver->write(master_bank, buffer, offset, count); - if (retval != ERROR_OK) - return retval; - - return ERROR_OK; + return master_bank->driver->write(master_bank, buffer, offset, count); } 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) { struct flash_bank *master_bank = virtual_get_master_bank(bank); - int retval; if (!master_bank) return ERROR_FLASH_OPERATION_FAILED; /* call master handler */ - retval = master_bank->driver->erase_check(master_bank); - if (retval != ERROR_OK) - return retval; - - return ERROR_OK; + return master_bank->driver->erase_check(master_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); - int retval; if (!master_bank) return ERROR_FLASH_OPERATION_FAILED; /* call master handler */ - retval = master_bank->driver->read(master_bank, buffer, offset, count); - if (retval != ERROR_OK) - return retval; - - return ERROR_OK; + return master_bank->driver->read(master_bank, buffer, offset, count); } const struct flash_driver virtual_flash = {