Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87cdb989 authored by Julia Lawall's avatar Julia Lawall Committed by John W. Linville
Browse files

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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2c8d5104

drivers/net/wireless/strip.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -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)) {

	if (time_after(jiffies, strip_info->pps_timer + HZ)) {

		unsigned long t = jiffies - strip_info->pps_timer;

		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 rx_pps_count =

		unsigned long tx_pps_count = (strip_info->tx_pps_count * HZ * 8 + t / 2) / t;

			DIV_ROUND_CLOSEST(strip_info->rx_pps_count*HZ*8, t);

		unsigned long sx_pps_count = (strip_info->sx_pps_count * HZ * 8 + t / 2) / 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->pps_timer = jiffies;

		strip_info->rx_pps_count = 0;

		strip_info->rx_pps_count = 0;