diff options
Diffstat (limited to 'drivers/ide/ide-timings.c')
-rw-r--r-- | drivers/ide/ide-timings.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/ide/ide-timings.c b/drivers/ide/ide-timings.c index 0e05f75934c9..1858e3ce3993 100644 --- a/drivers/ide/ide-timings.c +++ b/drivers/ide/ide-timings.c | |||
@@ -104,19 +104,19 @@ u16 ide_pio_cycle_time(ide_drive_t *drive, u8 pio) | |||
104 | EXPORT_SYMBOL_GPL(ide_pio_cycle_time); | 104 | EXPORT_SYMBOL_GPL(ide_pio_cycle_time); |
105 | 105 | ||
106 | #define ENOUGH(v, unit) (((v) - 1) / (unit) + 1) | 106 | #define ENOUGH(v, unit) (((v) - 1) / (unit) + 1) |
107 | #define EZ(v, unit) ((v) ? ENOUGH(v, unit) : 0) | 107 | #define EZ(v, unit) ((v) ? ENOUGH((v) * 1000, unit) : 0) |
108 | 108 | ||
109 | static void ide_timing_quantize(struct ide_timing *t, struct ide_timing *q, | 109 | static void ide_timing_quantize(struct ide_timing *t, struct ide_timing *q, |
110 | int T, int UT) | 110 | int T, int UT) |
111 | { | 111 | { |
112 | q->setup = EZ(t->setup * 1000, T); | 112 | q->setup = EZ(t->setup, T); |
113 | q->act8b = EZ(t->act8b * 1000, T); | 113 | q->act8b = EZ(t->act8b, T); |
114 | q->rec8b = EZ(t->rec8b * 1000, T); | 114 | q->rec8b = EZ(t->rec8b, T); |
115 | q->cyc8b = EZ(t->cyc8b * 1000, T); | 115 | q->cyc8b = EZ(t->cyc8b, T); |
116 | q->active = EZ(t->active * 1000, T); | 116 | q->active = EZ(t->active, T); |
117 | q->recover = EZ(t->recover * 1000, T); | 117 | q->recover = EZ(t->recover, T); |
118 | q->cycle = EZ(t->cycle * 1000, T); | 118 | q->cycle = EZ(t->cycle, T); |
119 | q->udma = EZ(t->udma * 1000, UT); | 119 | q->udma = EZ(t->udma, UT); |
120 | } | 120 | } |
121 | 121 | ||
122 | void ide_timing_merge(struct ide_timing *a, struct ide_timing *b, | 122 | void ide_timing_merge(struct ide_timing *a, struct ide_timing *b, |