diff options
author | Julia Lawall <julia@diku.dk> | 2008-04-19 21:15:41 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-19 21:15:41 -0400 |
commit | b132fba18bb5e30ed13ce3c623c18eb1e5795534 (patch) | |
tree | fcbbe9837b921aa4f17f2869e8b21915a98b10c4 /drivers/net/appletalk/cops.c | |
parent | 420635f517cf1bb8929caf80ce5a30e827b9df42 (diff) |
drivers/net/appletalk: use time_before, time_before_eq, etc
The functions time_before, time_before_eq, time_after, and time_after_eq
are more robust for comparing jiffies against other values.
A simplified version of the semantic patch making this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@ change_compare_np @
expression E;
@@
(
- jiffies <= E
+ time_before_eq(jiffies,E)
|
- jiffies >= E
+ time_after_eq(jiffies,E)
|
- jiffies < E
+ time_before(jiffies,E)
|
- jiffies > E
+ time_after(jiffies,E)
)
@ include depends on change_compare_np @
@@
#include <linux/jiffies.h>
@ no_include depends on !include && change_compare_np @
@@
#include <linux/...>
+ #include <linux/jiffies.h>
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/appletalk/cops.c')
-rw-r--r-- | drivers/net/appletalk/cops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index 65b901ebfd62..82e9a5bd0dd2 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
@@ -69,6 +69,7 @@ static const char *version = | |||
69 | #include <linux/atalk.h> | 69 | #include <linux/atalk.h> |
70 | #include <linux/spinlock.h> | 70 | #include <linux/spinlock.h> |
71 | #include <linux/bitops.h> | 71 | #include <linux/bitops.h> |
72 | #include <linux/jiffies.h> | ||
72 | 73 | ||
73 | #include <asm/system.h> | 74 | #include <asm/system.h> |
74 | #include <asm/io.h> | 75 | #include <asm/io.h> |
@@ -503,7 +504,7 @@ static void cops_reset(struct net_device *dev, int sleep) | |||
503 | long snap=jiffies; | 504 | long snap=jiffies; |
504 | 505 | ||
505 | /* Let card finish initializing, about 1/3 second */ | 506 | /* Let card finish initializing, about 1/3 second */ |
506 | while(jiffies-snap<HZ/3) | 507 | while (time_before(jiffies, snap + HZ/3)) |
507 | schedule(); | 508 | schedule(); |
508 | } | 509 | } |
509 | else | 510 | else |