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>

diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 6b969f8c684fad8d963c707cc85fcd139fb766ce..01ce241dbeae81423aed5bd2a49e784f9cff057c 100644 (file)
--- 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,
                                        pre = 1;
                                break;
                        case round_nearest:
-                               pre = (br+(c<<div)/2)/(c<<div);
+                               pre = DIV_ROUND_CLOSEST(br, c<<div);
                                // but p must be non-zero
                                if (!pre)
                                        pre = 1;
@@ -671,7 +671,7 @@ static int make_rate (const hrz_dev * dev, u32 c, rounding r,
                                        pre = DIV_ROUND_UP(br, c<<div);
                                        break;
                                case round_nearest:
-                                       pre = (br+(c<<div)/2)/(c<<div);
+                                       pre = DIV_ROUND_CLOSEST(br, c<<div);
                                        break;
                                default: /* round_up */
                                        pre = br/(c<<div);