diff options
author | Julia Lawall <julia@diku.dk> | 2009-08-02 04:47:27 -0400 |
---|---|---|
committer | Hirokazu Takata <takata@linux-m32r.org> | 2009-11-03 18:31:50 -0500 |
commit | 560235857fb79da48d36e8f866a0ee3b10a232bf (patch) | |
tree | 5635f5ec3fca87f35caf0ef0bff7fdbc21782ff1 /arch | |
parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) |
arch/m32r: 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@
@@
@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: Hirokazu Takata <takata@linux-m32r.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/m32r/kernel/time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c index e7fee0f198d5..9cedcef11575 100644 --- a/arch/m32r/kernel/time.c +++ b/arch/m32r/kernel/time.c | |||
@@ -75,7 +75,7 @@ u32 arch_gettimeoffset(void) | |||
75 | count = 0; | 75 | count = 0; |
76 | 76 | ||
77 | count = (latch - count) * TICK_SIZE; | 77 | count = (latch - count) * TICK_SIZE; |
78 | elapsed_time = (count + latch / 2) / latch; | 78 | elapsed_time = DIV_ROUND_CLOSEST(count, latch); |
79 | /* NOTE: LATCH is equal to the "interval" value (= reload count). */ | 79 | /* NOTE: LATCH is equal to the "interval" value (= reload count). */ |
80 | 80 | ||
81 | #else /* CONFIG_SMP */ | 81 | #else /* CONFIG_SMP */ |
@@ -93,7 +93,7 @@ u32 arch_gettimeoffset(void) | |||
93 | p_count = count; | 93 | p_count = count; |
94 | 94 | ||
95 | count = (latch - count) * TICK_SIZE; | 95 | count = (latch - count) * TICK_SIZE; |
96 | elapsed_time = (count + latch / 2) / latch; | 96 | elapsed_time = DIV_ROUND_CLOSEST(count, latch); |
97 | /* NOTE: LATCH is equal to the "interval" value (= reload count). */ | 97 | /* NOTE: LATCH is equal to the "interval" value (= reload count). */ |
98 | #endif /* CONFIG_SMP */ | 98 | #endif /* CONFIG_SMP */ |
99 | #elif defined(CONFIG_CHIP_M32310) | 99 | #elif defined(CONFIG_CHIP_M32310) |
@@ -211,7 +211,7 @@ void __init time_init(void) | |||
211 | 211 | ||
212 | bus_clock = boot_cpu_data.bus_clock; | 212 | bus_clock = boot_cpu_data.bus_clock; |
213 | divide = boot_cpu_data.timer_divide; | 213 | divide = boot_cpu_data.timer_divide; |
214 | latch = (bus_clock/divide + HZ / 2) / HZ; | 214 | latch = DIV_ROUND_CLOSEST(bus_clock/divide, HZ); |
215 | 215 | ||
216 | printk("Timer start : latch = %ld\n", latch); | 216 | printk("Timer start : latch = %ld\n", latch); |
217 | 217 | ||