| Message ID | 1464712565-14857-6-git-send-email-lvivier@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 05/31/2016 10:35 AM, Laurent Vivier wrote: > 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> > --- > 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)) { The tab-vs.-space issues in this file make the patch look weird. It's not your fault, but you may want to manually touch up the result so that visual indentation under 8-spaces-per-tab still looks okay. Reviewed-by: Eric Blake <eblake@redhat.com>
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;
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> --- block/vvfat.c | 3 +-- hw/block/tc58128.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)