From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz0bC-000256-Vo for qemu-devel@nongnu.org; Mon, 23 Jun 2014 05:31:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wz0b7-0004Vz-Rx for qemu-devel@nongnu.org; Mon, 23 Jun 2014 05:31:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51599) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz0b7-0004Vj-IO for qemu-devel@nongnu.org; Mon, 23 Jun 2014 05:31:33 -0400 From: Stefan Hajnoczi Date: Mon, 23 Jun 2014 17:31:14 +0800 Message-Id: <1403515879-14359-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1403515879-14359-1-git-send-email-stefanha@redhat.com> References: <1403515879-14359-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 1/6] block: m25p80: sync_page(): Deindent function body. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Peter Crosthwaite , Stefan Hajnoczi From: Peter Crosthwaite 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 Signed-off-by: Stefan Hajnoczi --- hw/block/m25p80.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 4076114..e4ef733 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) -- 1.9.3