diff options
author | Julia Lawall <julia@diku.dk> | 2009-08-01 18:48:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-02 15:54:22 -0400 |
commit | 8b97c7c283c5ba8f9f4dabd418fd7dcfcc8a387e (patch) | |
tree | dfce6f32f0c4836f67b8c9ab64a30cadb60c8295 | |
parent | 39506a552b4b302540e1f9c6c93a122df353e57d (diff) |
drivers/atm: 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: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/atm/horizon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c index 6b969f8c684f..01ce241dbeae 100644 --- a/drivers/atm/horizon.c +++ b/drivers/atm/horizon.c | |||
@@ -641,7 +641,7 @@ static int make_rate (const hrz_dev * dev, u32 c, rounding r, | |||
641 | pre = 1; | 641 | pre = 1; |
642 | break; | 642 | break; |
643 | case round_nearest: | 643 | case round_nearest: |
644 | pre = (br+(c<<div)/2)/(c<<div); | 644 | pre = DIV_ROUND_CLOSEST(br, c<<div); |
645 | // but p must be non-zero | 645 | // but p must be non-zero |
646 | if (!pre) | 646 | if (!pre) |
647 | pre = 1; | 647 | pre = 1; |
@@ -671,7 +671,7 @@ static int make_rate (const hrz_dev * dev, u32 c, rounding r, | |||
671 | pre = DIV_ROUND_UP(br, c<<div); | 671 | pre = DIV_ROUND_UP(br, c<<div); |
672 | break; | 672 | break; |
673 | case round_nearest: | 673 | case round_nearest: |
674 | pre = (br+(c<<div)/2)/(c<<div); | 674 | pre = DIV_ROUND_CLOSEST(br, c<<div); |
675 | break; | 675 | break; |
676 | default: /* round_up */ | 676 | default: /* round_up */ |
677 | pre = br/(c<<div); | 677 | pre = br/(c<<div); |