diff options
| author | Marc Schink <dev@zapb.de> | 2021-04-12 18:54:16 +0200 |
|---|---|---|
| committer | Tomas Vanek <vanekt@fbl.cz> | 2021-04-22 13:06:26 +0100 |
| commit | 41a6089504823433817ea67d9af3d2d85f402336 (patch) | |
| tree | 30ebd271c49271c71aa467168004147cdac51050 /src/flash | |
| parent | dc277057f57780354278cdc4876d393735f49369 (diff) | |
| download | riscv-openocd-41a6089504823433817ea67d9af3d2d85f402336.zip riscv-openocd-41a6089504823433817ea67d9af3d2d85f402336.tar.gz riscv-openocd-41a6089504823433817ea67d9af3d2d85f402336.tar.bz2 | |
flash/nor/nrf5: Fix data types and const correctness
Change-Id: I8c5bac7098d92e9b3bd1b045735879cf32ac218d
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/6163
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Tested-by: jenkins
Diffstat (limited to 'src/flash')
| -rw-r--r-- | src/flash/nor/nrf5.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/flash/nor/nrf5.c b/src/flash/nor/nrf5.c index 1784bcd..12bbac6 100644 --- a/src/flash/nor/nrf5.c +++ b/src/flash/nor/nrf5.c @@ -289,7 +289,7 @@ static const struct nrf5_device_package nrf5_packages_table[] = { const struct flash_driver nrf5_flash, nrf51_flash; -static int nrf5_bank_is_probed(struct flash_bank *bank) +static bool nrf5_bank_is_probed(const struct flash_bank *bank) { struct nrf5_bank *nbank = bank->driver_priv; @@ -309,13 +309,10 @@ static int nrf5_get_probed_chip_if_halted(struct flash_bank *bank, struct nrf5_i struct nrf5_bank *nbank = bank->driver_priv; *chip = nbank->chip; - int probed = nrf5_bank_is_probed(bank); - if (probed < 0) - return probed; - else if (!probed) - return nrf5_probe(bank); - else + if (nrf5_bank_is_probed(bank)) return ERROR_OK; + + return nrf5_probe(bank); } static int nrf5_wait_for_nvmc(struct nrf5_info *chip) @@ -872,14 +869,10 @@ static int nrf5_probe(struct flash_bank *bank) static int nrf5_auto_probe(struct flash_bank *bank) { - int probed = nrf5_bank_is_probed(bank); - - if (probed < 0) - return probed; - else if (probed) + if (nrf5_bank_is_probed(bank)) return ERROR_OK; - else - return nrf5_probe(bank); + + return nrf5_probe(bank); } static int nrf5_erase_all(struct nrf5_info *chip) |