Skip to content

Commit

Permalink
arch/x86/kernel/apm_32.c: use time_before, time_before_eq,
Browse files Browse the repository at this point in the history
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: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Julia Lawall authored and Ingo Molnar committed Jan 30, 2008
1 parent e5fc316 commit 4f2479f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/x86/kernel/apm_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@
#include <linux/dmi.h>
#include <linux/suspend.h>
#include <linux/kthread.h>
#include <linux/jiffies.h>

#include <asm/system.h>
#include <asm/uaccess.h>
Expand Down Expand Up @@ -1287,7 +1288,7 @@ static void check_events(void)
"event 0x%02x\n", event);
}
if (ignore_bounce
&& ((jiffies - last_resume) > bounce_interval))
&& (time_after(jiffies, last_resume + bounce_interval)))
ignore_bounce = 0;

switch (event) {
Expand Down

0 comments on commit 4f2479f

Please sign in to comment.