diff options
author | Manuel Schölling <manuel.schoelling@gmx.de> | 2014-05-18 06:45:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-18 21:24:52 -0400 |
commit | 03b8dcba1e6ea636a96d80f7adbf03d748d517ad (patch) | |
tree | d8ac038995c21cfbe68c72e798ddaaed379cf29e | |
parent | da26a625bfa8d12b789f12a107a2e389c236c362 (diff) |
net: 8390: use time_after() for time comparison
To be future-proof and for better readability the time comparisons are modified
to use time_after() instead of raw math.
Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/8390/ax88796.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c index 455d4c399b52..1d162ccb4733 100644 --- a/drivers/net/ethernet/8390/ax88796.c +++ b/drivers/net/ethernet/8390/ax88796.c | |||
@@ -157,7 +157,7 @@ static void ax_reset_8390(struct net_device *dev) | |||
157 | 157 | ||
158 | /* This check _should_not_ be necessary, omit eventually. */ | 158 | /* This check _should_not_ be necessary, omit eventually. */ |
159 | while ((ei_inb(addr + EN0_ISR) & ENISR_RESET) == 0) { | 159 | while ((ei_inb(addr + EN0_ISR) & ENISR_RESET) == 0) { |
160 | if (jiffies - reset_start_time > 2 * HZ / 100) { | 160 | if (time_after(jiffies, reset_start_time + 2 * HZ / 100)) { |
161 | netdev_warn(dev, "%s: did not complete.\n", __func__); | 161 | netdev_warn(dev, "%s: did not complete.\n", __func__); |
162 | break; | 162 | break; |
163 | } | 163 | } |
@@ -293,7 +293,7 @@ static void ax_block_output(struct net_device *dev, int count, | |||
293 | dma_start = jiffies; | 293 | dma_start = jiffies; |
294 | 294 | ||
295 | while ((ei_inb(nic_base + EN0_ISR) & ENISR_RDC) == 0) { | 295 | while ((ei_inb(nic_base + EN0_ISR) & ENISR_RDC) == 0) { |
296 | if (jiffies - dma_start > 2 * HZ / 100) { /* 20ms */ | 296 | if (time_after(jiffies, dma_start + 2 * HZ / 100)) { /* 20ms */ |
297 | netdev_warn(dev, "timeout waiting for Tx RDC.\n"); | 297 | netdev_warn(dev, "timeout waiting for Tx RDC.\n"); |
298 | ax_reset_8390(dev); | 298 | ax_reset_8390(dev); |
299 | ax_NS8390_init(dev, 1); | 299 | ax_NS8390_init(dev, 1); |