diff options
| author | Laurent Vivier <lvivier@redhat.com> | 2016-05-31 18:35:54 +0200 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2016-06-07 18:19:24 +0300 |
| commit | 13385ae168517a3ae8b5a10537c02e5ca41e970f (patch) | |
| tree | bf0f36516e70bc8df175203ed353021497fd279d | |
| parent | c41a73ffaf40aadc2c1e038ae4d12b62cd578e7f (diff) | |
| download | qemu-13385ae168517a3ae8b5a10537c02e5ca41e970f.zip | |
block: Use DIV_ROUND_UP
Replace (((n) + (d) - 1) /(d)) by DIV_ROUND_UP(n,d).
This patch is the result of coccinelle script
scripts/coccinelle/round.cocci
CC: qemu-block@nongnu.org
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | block/vvfat.c | 3 | ||||
| -rw-r--r-- | hw/block/tc58128.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/block/vvfat.c b/block/vvfat.c index a39dbe67e2..6d2e21ce11 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 7909d5041e..1d9f7ee000 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; |