diff options
| author | Julia Lawall <julia@diku.dk> | 2009-08-02 22:19:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-07 19:42:58 +0200 |
| commit | 72db37b2c9c5b71e49068f5fac6433a6c36498a5 (patch) | |
| tree | dbd002ec727a1e626924890c46631f9d58063a7a /drivers/ide/ide-cd.c | |
| parent | ide-tape: fix handling of postponed rqs (diff) | |
| download | linux-72db37b2c9c5b71e49068f5fac6433a6c36498a5.tar.xz linux-72db37b2c9c5b71e49068f5fac6433a6c36498a5.zip | |
drivers/ide/ide-cd.c: 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>
Acked-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide/ide-cd.c')
| -rw-r--r-- | drivers/ide/ide-cd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 6a9a769bffc1..ad0ab0c0a493 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -1146,8 +1146,8 @@ void ide_cdrom_update_speed(ide_drive_t *drive, u8 *buf) ide_debug_log(IDE_DBG_PROBE, "curspeed: %u, maxspeed: %u", curspeed, maxspeed); - cd->current_speed = (curspeed + (176/2)) / 176; - cd->max_speed = (maxspeed + (176/2)) / 176; + cd->current_speed = DIV_ROUND_CLOSEST(curspeed, 176); + cd->max_speed = DIV_ROUND_CLOSEST(maxspeed, 176); } #define IDE_CD_CAPABILITIES \ |