diff options
| author | Peter Crosthwaite <peter.crosthwaite@xilinx.com> | 2014-06-18 18:36:03 -0700 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-06-21 16:40:14 +0800 |
| commit | fc1084aad72297cb6dbccf4c78473b5390ff6c87 (patch) | |
| tree | 430bf03ae1bcfbdf58fad4522d42be027165974c /hw/block | |
| parent | 427e1750a0b98a72cad424327604f51e993dcc5f (diff) | |
block: m25p80: sync_page(): Deindent function body.
sync_page() was conditionalizing it's whole fn body on the bdrv being
non-null. Just return for the function immediately on NULL brdv and
get rid of the big if.
Makes implementation consistent with flash_zynq_area().
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/m25p80.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 4076114b32..e4ef733cc1 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -288,18 +288,20 @@ static void bdrv_sync_complete(void *opaque, int ret) static void flash_sync_page(Flash *s, int page) { - if (s->bdrv) { - int bdrv_sector, nb_sectors; - QEMUIOVector iov; - - bdrv_sector = (page * s->pi->page_size) / BDRV_SECTOR_SIZE; - nb_sectors = DIV_ROUND_UP(s->pi->page_size, BDRV_SECTOR_SIZE); - qemu_iovec_init(&iov, 1); - qemu_iovec_add(&iov, s->storage + bdrv_sector * BDRV_SECTOR_SIZE, - nb_sectors * BDRV_SECTOR_SIZE); - bdrv_aio_writev(s->bdrv, bdrv_sector, &iov, nb_sectors, - bdrv_sync_complete, NULL); + int bdrv_sector, nb_sectors; + QEMUIOVector iov; + + if (!s->bdrv) { + return; } + + bdrv_sector = (page * s->pi->page_size) / BDRV_SECTOR_SIZE; + nb_sectors = DIV_ROUND_UP(s->pi->page_size, BDRV_SECTOR_SIZE); + qemu_iovec_init(&iov, 1); + qemu_iovec_add(&iov, s->storage + bdrv_sector * BDRV_SECTOR_SIZE, + nb_sectors * BDRV_SECTOR_SIZE); + bdrv_aio_writev(s->bdrv, bdrv_sector, &iov, nb_sectors, bdrv_sync_complete, + NULL); } static inline void flash_sync_area(Flash *s, int64_t off, int64_t len) |