drivers/net/wireless: Use DIV_ROUND_CLOSEST

The kernel.h macro DIV_ROUND_CLOSEST performs the computation (x + d/2)/d
but is perhaps more readable.

The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@haskernel@
@@

#include <linux/kernel.h>

@depends on haskernel@
expression x,__divisor;
@@

- (((x) + ((__divisor) / 2)) / (__divisor))
+ DIV_ROUND_CLOSEST(x,__divisor)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 73300c226f6737928c03e396ee6b42c531bc1a4a..ef2cb20e96ad9a49477b97c24b7a383157d43e1a 100644 (file)
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -1550,9 +1550,12 @@ static int strip_xmit(struct sk_buff *skb, struct net_device *dev)
 
        if (time_after(jiffies, strip_info->pps_timer + HZ)) {
                unsigned long t = jiffies - strip_info->pps_timer;
-               unsigned long rx_pps_count = (strip_info->rx_pps_count * HZ * 8 + t / 2) / t;
-               unsigned long tx_pps_count = (strip_info->tx_pps_count * HZ * 8 + t / 2) / t;
-               unsigned long sx_pps_count = (strip_info->sx_pps_count * HZ * 8 + t / 2) / t;
+               unsigned long rx_pps_count =
+                       DIV_ROUND_CLOSEST(strip_info->rx_pps_count*HZ*8, t);
+               unsigned long tx_pps_count =
+                       DIV_ROUND_CLOSEST(strip_info->tx_pps_count*HZ*8, t);
+               unsigned long sx_pps_count =
+                       DIV_ROUND_CLOSEST(strip_info->sx_pps_count*HZ*8, t);
 
                strip_info->pps_timer = jiffies;
                strip_info->rx_pps_count = 0;