diff options
author | Julia Lawall <julia@diku.dk> | 2008-04-26 11:36:35 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 11:36:35 -0400 |
commit | 00fe8b7ac2ff6b8afba11642fb71cdb17aa34df9 (patch) | |
tree | 69ac4748267d573634ed70c724dc5482f112e8ee /drivers/ide/pci/cmd640.c | |
parent | 5e71d9c5a50b92b33d35061d42ac39166db9578e (diff) |
ide: use DIV_ROUND_UP
The kernel.h macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) /
(d)) but is perhaps more readable.
An extract of 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 n,d;
@@
(
- (n + d - 1) / d
+ DIV_ROUND_UP(n,d)
|
- (n + (d - 1)) / d
+ DIV_ROUND_UP(n,d)
)
@depends on haskernel@
expression n,d;
@@
- DIV_ROUND_UP((n),d)
+ DIV_ROUND_UP(n,d)
@depends on haskernel@
expression n,d;
@@
- DIV_ROUND_UP(n,(d))
+ DIV_ROUND_UP(n,d)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/cmd640.c')
-rw-r--r-- | drivers/ide/pci/cmd640.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c index fed93417d54a..662099a98a72 100644 --- a/drivers/ide/pci/cmd640.c +++ b/drivers/ide/pci/cmd640.c | |||
@@ -561,15 +561,15 @@ static void cmd640_set_mode(ide_drive_t *drive, unsigned int index, | |||
561 | active_time = ide_pio_timings[pio_mode].active_time; | 561 | active_time = ide_pio_timings[pio_mode].active_time; |
562 | recovery_time = cycle_time - (setup_time + active_time); | 562 | recovery_time = cycle_time - (setup_time + active_time); |
563 | clock_time = 1000 / bus_speed; | 563 | clock_time = 1000 / bus_speed; |
564 | cycle_count = (cycle_time + clock_time - 1) / clock_time; | 564 | cycle_count = DIV_ROUND_UP(cycle_time, clock_time); |
565 | 565 | ||
566 | setup_count = (setup_time + clock_time - 1) / clock_time; | 566 | setup_count = DIV_ROUND_UP(setup_time, clock_time); |
567 | 567 | ||
568 | active_count = (active_time + clock_time - 1) / clock_time; | 568 | active_count = DIV_ROUND_UP(active_time, clock_time); |
569 | if (active_count < 2) | 569 | if (active_count < 2) |
570 | active_count = 2; /* minimum allowed by cmd640 */ | 570 | active_count = 2; /* minimum allowed by cmd640 */ |
571 | 571 | ||
572 | recovery_count = (recovery_time + clock_time - 1) / clock_time; | 572 | recovery_count = DIV_ROUND_UP(recovery_time, clock_time); |
573 | recovery_count2 = cycle_count - (setup_count + active_count); | 573 | recovery_count2 = cycle_count - (setup_count + active_count); |
574 | if (recovery_count2 > recovery_count) | 574 | if (recovery_count2 > recovery_count) |
575 | recovery_count = recovery_count2; | 575 | recovery_count = recovery_count2; |