projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] drivers/net/*: use time_after() and friends
[deliverable/linux.git]
/
drivers
/
net
/
3c523.c
diff --git
a/drivers/net/3c523.c
b/drivers/net/3c523.c
index 9e1fe2e0478c3e783492e435c276e00f2d3935f1..b40885d4168092baa1d3e6e691e1aea0b2428227 100644
(file)
--- a/
drivers/net/3c523.c
+++ b/
drivers/net/3c523.c
@@
-105,6
+105,7
@@
#include <linux/mca-legacy.h>
#include <linux/ethtool.h>
#include <linux/bitops.h>
#include <linux/mca-legacy.h>
#include <linux/ethtool.h>
#include <linux/bitops.h>
+#include <linux/jiffies.h>
#include <asm/uaccess.h>
#include <asm/processor.h>
#include <asm/uaccess.h>
#include <asm/processor.h>
@@
-658,7
+659,7
@@
static int init586(struct net_device *dev)
s = jiffies; /* warning: only active with interrupts on !! */
while (!(cfg_cmd->cmd_status & STAT_COMPL)) {
s = jiffies; /* warning: only active with interrupts on !! */
while (!(cfg_cmd->cmd_status & STAT_COMPL)) {
- if (
jiffies - s > 30*HZ/100
)
+ if (
time_after(jiffies, s + 30*HZ/100)
)
break;
}
break;
}
@@
-684,7
+685,7
@@
static int init586(struct net_device *dev)
s = jiffies;
while (!(ias_cmd->cmd_status & STAT_COMPL)) {
s = jiffies;
while (!(ias_cmd->cmd_status & STAT_COMPL)) {
- if (
jiffies - s > 30*HZ/100
)
+ if (
time_after(jiffies, s + 30*HZ/100)
)
break;
}
break;
}
@@
-709,7
+710,7
@@
static int init586(struct net_device *dev)
s = jiffies;
while (!(tdr_cmd->cmd_status & STAT_COMPL)) {
s = jiffies;
while (!(tdr_cmd->cmd_status & STAT_COMPL)) {
- if (
jiffies - s > 30*HZ/100
) {
+ if (
time_after(jiffies, s + 30*HZ/100)
) {
printk(KERN_WARNING "%s: %d Problems while running the TDR.\n", dev->name, __LINE__);
result = 1;
break;
printk(KERN_WARNING "%s: %d Problems while running the TDR.\n", dev->name, __LINE__);
result = 1;
break;
@@
-798,7
+799,7
@@
static int init586(struct net_device *dev)
elmc_id_attn586();
s = jiffies;
while (!(mc_cmd->cmd_status & STAT_COMPL)) {
elmc_id_attn586();
s = jiffies;
while (!(mc_cmd->cmd_status & STAT_COMPL)) {
- if (
jiffies - s > 30*HZ/100
)
+ if (
time_after(jiffies, s + 30*HZ/100)
)
break;
}
if (!(mc_cmd->cmd_status & STAT_COMPL)) {
break;
}
if (!(mc_cmd->cmd_status & STAT_COMPL)) {
This page took
0.025866 seconds
and
5
git commands to generate.