]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
drivers/net/appletalk: use time_before, time_before_eq, etc
authorJulia Lawall <julia@diku.dk>
Sun, 20 Apr 2008 01:15:41 +0000 (18:15 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 20 Apr 2008 01:15:41 +0000 (18:15 -0700)
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>
drivers/net/appletalk/cops.c

index 65b901ebfd621de68c7cb7e45dce2b7480d93c8b..82e9a5bd0dd29f7a4297500910e292668832b817 100644 (file)
@@ -69,6 +69,7 @@ static const char *version =
 #include <linux/atalk.h>
 #include <linux/spinlock.h>
 #include <linux/bitops.h>
+#include <linux/jiffies.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -503,7 +504,7 @@ static void cops_reset(struct net_device *dev, int sleep)
                         long snap=jiffies;
 
                        /* Let card finish initializing, about 1/3 second */
-                       while(jiffies-snap<HZ/3)
+                       while (time_before(jiffies, snap + HZ/3))
                                 schedule();
                 }
                 else