[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 07/13] hw/block/pflash_cfi02: Simplify a statement u
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-block] [PATCH 07/13] hw/block/pflash_cfi02: Simplify a statement using fall through |
Date: |
Mon, 6 May 2019 00:15:38 +0200 |
Signed-off-by: Stephen Checkoway <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
[PMD: Extracted from bigger patch]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/block/pflash_cfi02.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index 9673eee969f..1e006e7bf3a 100644
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -241,10 +241,10 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr
offset,
case 0x0E:
case 0x0F:
ret = boff & 0x01 ? pfl->ident3 : pfl->ident2;
- if (ret == (uint8_t)-1) {
- goto flash_read;
+ if (ret != (uint8_t)-1) {
+ break;
}
- break;
+ /* Fall through to data read. */
default:
goto flash_read;
}
--
2.20.1
- [Qemu-block] [PATCH 00/13] hw/block/pflash_cfi02: Clean-up and fixes, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-block] [PATCH 02/13] tests/pflash-cfi02: Use the GLib API, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-block] [PATCH 09/13] hw/block/pflash_cfi02: Use the ldst API in pflash_read(), Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-block] [PATCH 10/13] hw/block/pflash_cfi02: Extract the pflash_data_read() function, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-block] [PATCH 01/13] tests/pflash-cfi02: Add test for supported CFI commands, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-block] [PATCH 08/13] hw/block/pflash_cfi02: Use the ldst API in pflash_write(), Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-block] [PATCH 07/13] hw/block/pflash_cfi02: Simplify a statement using fall through,
Philippe Mathieu-Daudé <=
- [Qemu-block] [PATCH 11/13] hw/block/pflash_cfi02: Unify the MemoryRegionOps, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-block] [PATCH 04/13] hw/block/pflash_cfi02: Fix debug format string, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-block] [PATCH 05/13] hw/block/pflash_cfi02: Add an enum to define the write cycles, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-block] [PATCH 13/13] hw/block/pflash_cfi02: Use the chip erase time specified in the CFI table, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-block] [PATCH 12/13] hw/block/pflash_cfi02: Fix command address comparison, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-block] [PATCH 03/13] tests/pflash-cfi02: Use IEC binary prefixes for size constants, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-block] [PATCH 06/13] hw/block/pflash_cfi02: Add helpers to manipulate the status bits, Philippe Mathieu-Daudé, 2019/05/05