From: Alexandre Bailon Date: Thu, 25 Feb 2016 17:19:16 +0000 (+0100) Subject: greybus: loopback: Fix averaging X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fb37f137b78f186275b15e8ce1e5a26b51a6e6ad;p=openwrt%2Fstaging%2Fblogic.git greybus: loopback: Fix averaging Currently, we are adding 0.5 to the average to round the average. But we are using the remainder to calculate the decimal, so we do not need to round the average. In addition, use a u64 type for the remainder to avoid overflow that might happen when stats->sum value is too big, usually for requests per seconds and the throughput. Signed-off-by: Alexandre Bailon Reviewed-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c index 85d3e35e6a5f..9f0da577d842 100644 --- a/drivers/staging/greybus/loopback.c +++ b/drivers/staging/greybus/loopback.c @@ -157,14 +157,15 @@ static ssize_t name##_avg_show(struct device *dev, \ { \ struct gb_loopback_stats *stats; \ struct gb_loopback *gb; \ - u64 avg; \ - u32 count, rem; \ + u64 avg, rem; \ + u32 count; \ gb = dev_get_drvdata(dev); \ stats = &gb->name; \ count = stats->count ? stats->count : 1; \ - avg = stats->sum + count / 2; /* round closest */ \ + avg = stats->sum; \ rem = do_div(avg, count); \ - return sprintf(buf, "%llu.%06u\n", avg, 1000000 * rem / count); \ + rem = 1000000 * rem / count; \ + return sprintf(buf, "%llu.%06u\n", avg, (u32)rem); \ } \ static DEVICE_ATTR_RO(name##_avg)