summaryrefslogtreecommitdiffstats
path: root/hw/block
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2019-06-27 15:44:24 +0200
committerPhilippe Mathieu-Daudé2019-07-02 02:32:39 +0200
commit8a508e7064bbe7d434a93f3284e6d93881c68a44 (patch)
tree2cf937528693e2a32855e98460b20df6ee29af17 /hw/block
parenthw/block/pflash_cfi02: Extract pflash_regions_count() (diff)
downloadqemu-8a508e7064bbe7d434a93f3284e6d93881c68a44.tar.gz
qemu-8a508e7064bbe7d434a93f3284e6d93881c68a44.tar.xz
qemu-8a508e7064bbe7d434a93f3284e6d93881c68a44.zip
hw/block/pflash_cfi02: Split if() condition
Split the if() condition check and arrange the indentation to ease the review of the next patches. No logical change. Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Message-Id: <20190627202719.17739-21-philmd@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Diffstat (limited to 'hw/block')
-rw-r--r--hw/block/pflash_cfi02.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index a0d3bd60dc..08b2bc83cb 100644
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -309,8 +309,10 @@ static void pflash_write(void *opaque, hwaddr offset, uint64_t value,
trace_pflash_io_write(offset, width, width << 1, value, pfl->wcycle);
cmd = value;
- if (pfl->cmd != 0xA0 && cmd == 0xF0) {
- goto reset_flash;
+ if (pfl->cmd != 0xA0) {
+ if (cmd == 0xF0) {
+ goto reset_flash;
+ }
}
offset &= pfl->chip_len - 1;