[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 41/52] block: Use DIV_ROUND_UP
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 41/52] block: Use DIV_ROUND_UP |
Date: |
Sun, 5 Jun 2016 10:43:18 +0300 |
From: Laurent Vivier <address@hidden>
Replace (((n) + (d) - 1) /(d)) by DIV_ROUND_UP(n,d).
This patch is the result of coccinelle script
scripts/coccinelle/round.cocci
CC: address@hidden
Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
block/vvfat.c | 3 +--
hw/block/tc58128.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/block/vvfat.c b/block/vvfat.c
index a39dbe6..6d2e21c 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -1960,8 +1960,7 @@ DLOG(fprintf(stderr, "check direntry %d:\n", i);
print_direntry(direntries + i))
/* check file size with FAT */
cluster_count = get_cluster_count_for_direntry(s, direntries +
i, path2);
if (cluster_count !=
- (le32_to_cpu(direntries[i].size) + s->cluster_size
- - 1) / s->cluster_size) {
+ DIV_ROUND_UP(le32_to_cpu(direntries[i].size), s->cluster_size)) {
DLOG(fprintf(stderr, "Cluster count mismatch\n"));
goto fail;
}
diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c
index 7909d50..1d9f7ee 100644
--- a/hw/block/tc58128.c
+++ b/hw/block/tc58128.c
@@ -45,7 +45,7 @@ static void init_dev(tc58128_dev * dev, const char *filename)
}
} else {
/* Build first block with number of blocks */
- blocks = (ret + 528 * 32 - 1) / (528 * 32);
+ blocks = DIV_ROUND_UP(ret, 528 * 32);
dev->flash_contents[0] = blocks & 0xff;
dev->flash_contents[1] = (blocks >> 8) & 0xff;
dev->flash_contents[2] = (blocks >> 16) & 0xff;
--
2.1.4
- [Qemu-devel] [PULL 43/52] xen: Use DIV_ROUND_UP, (continued)
- [Qemu-devel] [PULL 43/52] xen: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 30/52] qga: Remove unnecessary glib.h includes, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 35/52] thunk: Drop unused NO_THUNK_TYPE_SIZE guards, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 04/52] qga: spelling fix, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 23/52] hw: Clean up includes, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 51/52] qemu-timer: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 12/52] replace muldiv64(a, b, c) by (uint64_t)a * b / c, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 02/52] hw/ipmi: fix spelling, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 21/52] fw_cfg: follow CODING_STYLE, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 16/52] configure: Use $(..) instead of deprecated `..`, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 41/52] block: Use DIV_ROUND_UP,
Michael Tokarev <=
- [Qemu-devel] [PULL 22/52] replay: Clean up includes, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 45/52] SPICE: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 03/52] docs: "specify" spell fix, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 39/52] qcow/qcow2: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 33/52] host-utils: Prefer 'false' for bool type, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 49/52] linux-user: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 28/52] clean-includes: Add glib.h to list of unneeded includes, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 37/52] coccinelle: use macro DIV_ROUND_UP instead of (((n) + (d) - 1) /(d)), Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 48/52] slirp: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 47/52] usb: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05