From: Peter Crosthwaite <peter.crosthwa...@xilinx.com>
Most of this computation of s->iolen is the same for both the if and
else paths here. Factor out the common parts outside the if.
Cc: qemu-triv...@nongnu.org
Signed-off-by: Peter Crosthwaite <peter.crosthwa...@xilinx.com>
---
hw/block/nand.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/block/nand.c b/hw/block/nand.c
index 087ca14..6309f93 100644
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -272,10 +272,10 @@ static void nand_command(NANDFlashState *s)
break;
offset = s->addr & ((1 << s->addr_shift) - 1);
s->blk_load(s, s->addr, offset);
- if (s->gnd)
- s->iolen = (1 << s->page_shift) - offset;
- else
- s->iolen = (1 << s->page_shift) + (1 << s->oob_shift) - offset;
+ s->iolen = (1 << s->page_shift) - offset;
+ if (!s->gnd) {
+ s->iolen += 1 << s->oob_shift;
+ }
break;
case NAND_CMD_RESET:
--
1.8.3.rc1.44.gb387c77.dirty
